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

GP-5633: Fixed a bug that prevented new installations of Ghidra from

Browse source 
applying preferences found in older installed versions of Ghidra
This commit is contained in:
Ryan Kurtz 2025-05-05 12:23:30 -04:00
parent f0a327ff11
commit d2d3590d28
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -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) &&