Ghidra is a software reverse engineering (SRE) framework
GP-5698: Don't go to parent unless we have ghidra.repos.config.
Dandbd574cfb2fe
diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.javaindex dfff4c2b8b..b1c789336d 100644--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.java+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.java@@ -4,9 +4,9 @@* Licensed under the Apache License, Version 2.0 (the "License");* you may not use this file except in compliance with the License.* You may obtain a copy of the License at- *+ ** http://www.apache.org/licenses/LICENSE-2.0- *+ ** Unless required by applicable law or agreed to in writing, software* distributed under the License is distributed on an "AS IS" BASIS,* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.@@ -46,7 +46,7 @@ public class GhidraServerApplicationLayout extends ApplicationLayout {// Application installation directoryapplicationInstallationDir = getApplicationRootDirs().iterator().next().getParentFile();- if (SystemUtilities.isInDevelopmentMode()) {+ if (SystemUtilities.isInDevelopmentMode() && getApplicationRootDirs().size() > 1) {applicationInstallationDir = applicationInstallationDir.getParentFile();}diff --git a/Ghidra/Framework/Generic/src/main/java/generic/application/GenericApplicationLayout.java b/Ghidra/Framework/Generic/src/main/java/generic/application/GenericApplicationLayout.javaindex 95dd0ce58e..0928d0bc40 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/application/GenericApplicationLayout.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/application/GenericApplicationLayout.java@@ -4,9 +4,9 @@* Licensed under the Apache License, Version 2.0 (the "License");* you may not use this file except in compliance with the License.* You may obtain a copy of the License at- *+ ** http://www.apache.org/licenses/LICENSE-2.0- *+ ** Unless required by applicable law or agreed to in writing, software* distributed under the License is distributed on an "AS IS" BASIS,* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.@@ -96,7 +96,7 @@ public class GenericApplicationLayout extends ApplicationLayout {// Application installation directoryapplicationInstallationDir = applicationRootDirs.iterator().next().getParentFile();- if (SystemUtilities.isInDevelopmentMode()) {+ if (SystemUtilities.isInDevelopmentMode() && applicationRootDirs.size() > 1) {applicationInstallationDir = applicationInstallationDir.getParentFile();}diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.javaindex 007f862d44..ba8b907602 100644--- a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java+++ b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java@@ -133,7 +133,7 @@ public class GhidraApplicationLayout extends ApplicationLayout {}ResourceFile dir = applicationRootDirs.iterator().next().getParentFile();- if (SystemUtilities.isInDevelopmentMode()) {+ if (SystemUtilities.isInDevelopmentMode() && applicationRootDirs.size() > 1) {dir = dir.getParentFile();}return dir;