Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 02:59:00 +08:00
Code Issues Actions Packages Projects 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
parent 7ed4b39bab 39520f7894
commit 01cb570dc7
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Generic/src/main/java/ghidra/framework/GenericRunInfo.java
+7 -5
View File
@@ -47,15 +47,15 @@ public class GenericRunInfo {
File userSettingsDirectory = Application.getUserSettingsDirectory();
List<File> appDirs =
collectAllApplicationDirectories(userSettingsDirectory.getParentFile());
collectAllApplicationDirectories(userSettingsDirectory.getParentFile(), false);
// Search "legacy" user setting directory locations in case the user has upgraded from an
// older version
try {
File legacyUserSettingsDirectory = ApplicationUtilities.getLegacyUserSettingsDir(
layout.getApplicationProperties(), layout.getApplicationInstallationDir());
appDirs.addAll(
collectAllApplicationDirectories(legacyUserSettingsDirectory.getParentFile()));
appDirs.addAll(collectAllApplicationDirectories(
legacyUserSettingsDirectory.getParentFile(), true));
}
catch (FileNotFoundException e) {
// ignore
@@ -92,9 +92,11 @@ public class GenericRunInfo {
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 -> {
String name = f.getName();
return f.isDirectory() && name.startsWith(settingsDirPrefix) &&