yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2025-05-05 12:44:07 -04:00
commit 01cb570dc7
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ghidra/Framework/Generic/src/main/java/ghidra/framework/GenericRunInfo.java
View file

@ -47,15 +47,15 @@ public class GenericRunInfo {
File userSettingsDirectory = Application.getUserSettingsDirectory(); File userSettingsDirectory = Application.getUserSettingsDirectory();
List<File> appDirs = List<File> appDirs =
collectAllApplicationDirectories(userSettingsDirectory.getParentFile()); collectAllApplicationDirectories(userSettingsDirectory.getParentFile(), false);
// Search "legacy" user setting directory locations in case the user has upgraded from an // Search "legacy" user setting directory locations in case the user has upgraded from an
// older version // older version
try { try {
File legacyUserSettingsDirectory = ApplicationUtilities.getLegacyUserSettingsDir( File legacyUserSettingsDirectory = ApplicationUtilities.getLegacyUserSettingsDir(
layout.getApplicationProperties(), layout.getApplicationInstallationDir()); layout.getApplicationProperties(), layout.getApplicationInstallationDir());
appDirs.addAll( appDirs.addAll(collectAllApplicationDirectories(
collectAllApplicationDirectories(legacyUserSettingsDirectory.getParentFile())); legacyUserSettingsDirectory.getParentFile(), true));
} }
catch (FileNotFoundException e) { catch (FileNotFoundException e) {
// ignore // ignore
@ -92,9 +92,11 @@ public class GenericRunInfo {
return appDirs; return appDirs;
} }
private static List<File> collectAllApplicationDirectories(File dataDirectoryParentDir) { private static List<File> collectAllApplicationDirectories(File dataDirectoryParentDir,
boolean legacy) {
String settingsDirPrefix = "." + Application.getName().replaceAll("\\s", "").toLowerCase(); String appName = Application.getName().replaceAll("\\s", "").toLowerCase();
String settingsDirPrefix = (legacy ? "." : "") + appName;
FileFilter userDirFilter = f -> { FileFilter userDirFilter = f -> {
String name = f.getName(); String name = f.getName();
return f.isDirectory() && name.startsWith(settingsDirPrefix) && return f.isDirectory() && name.startsWith(settingsDirPrefix) &&