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

GP-0 corrected missing userSettingsDir for GhidraServerApplicationLayout

Browse source
This commit is contained in:
ghidra1 2023-08-02 18:05:38 -04:00
parent 8073611e66
commit f96ae4bb37
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServer.java
View file

@ -408,7 +408,7 @@ public class GhidraServer extends UnicastRemoteObject implements GhidraServerHan
/** /**
* Display an optional message followed by usage syntax. * Display an optional message followed by usage syntax.
* *
* @param msg * @param msg optional message (may be null)
*/ */
private static void displayUsage(String msg) { private static void displayUsage(String msg) {
if (msg != null) { if (msg != null) {
@ -498,7 +498,7 @@ public class GhidraServer extends UnicastRemoteObject implements GhidraServerHan
ResourceFile serverRoot = new ResourceFile(Application.getInstallationDirectory(), ResourceFile serverRoot = new ResourceFile(Application.getInstallationDirectory(),
SystemUtilities.isInDevelopmentMode() ? "ghidra/Ghidra/RuntimeScripts/Common/server" SystemUtilities.isInDevelopmentMode() ? "ghidra/Ghidra/RuntimeScripts/Common/server"
: "server"); : "server");
if (serverRoot == null || serverRoot.getFile(false) == null) { if (serverRoot.getFile(false) == null) {
System.err.println( System.err.println(
"Failed to resolve installation root directory!: " + serverRoot.getAbsolutePath()); "Failed to resolve installation root directory!: " + serverRoot.getAbsolutePath());
System.exit(-1); System.exit(-1);

2
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.java
View file

@ -57,6 +57,8 @@ public class GhidraServerApplicationLayout extends ApplicationLayout {
// User directories (don't let anything use the user home directory...there may not be one) // User directories (don't let anything use the user home directory...there may not be one)
userTempDir = ApplicationUtilities.getDefaultUserTempDir(applicationProperties); userTempDir = ApplicationUtilities.getDefaultUserTempDir(applicationProperties);
userSettingsDir = ApplicationUtilities.getDefaultUserSettingsDir(applicationProperties,
applicationInstallationDir);
// Modules - required to find module data files // Modules - required to find module data files
modules = ModuleUtilities.findModules(applicationRootDirs, modules = ModuleUtilities.findModules(applicationRootDirs,