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

GP-5698: Don't go to parent unless we have ghidra.repos.config.

Browse source
This commit is contained in:
Dan 2025-05-16 15:48:38 +00:00
parent 0b8985a257
commit dbd574cfb2
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.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.
@ -46,7 +46,7 @@ public class GhidraServerApplicationLayout extends ApplicationLayout {
// Application installation directory // Application installation directory
applicationInstallationDir = getApplicationRootDirs().iterator().next().getParentFile(); applicationInstallationDir = getApplicationRootDirs().iterator().next().getParentFile();
if (SystemUtilities.isInDevelopmentMode()) { if (SystemUtilities.isInDevelopmentMode() && getApplicationRootDirs().size() > 1) {
applicationInstallationDir = applicationInstallationDir.getParentFile(); applicationInstallationDir = applicationInstallationDir.getParentFile();
} }

6
Ghidra/Framework/Generic/src/main/java/generic/application/GenericApplicationLayout.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.
@ -96,7 +96,7 @@ public class GenericApplicationLayout extends ApplicationLayout {
// Application installation directory // Application installation directory
applicationInstallationDir = applicationRootDirs.iterator().next().getParentFile(); applicationInstallationDir = applicationRootDirs.iterator().next().getParentFile();
if (SystemUtilities.isInDevelopmentMode()) { if (SystemUtilities.isInDevelopmentMode() && applicationRootDirs.size() > 1) {
applicationInstallationDir = applicationInstallationDir.getParentFile(); applicationInstallationDir = applicationInstallationDir.getParentFile();
} }

2
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java
View file

@ -133,7 +133,7 @@ public class GhidraApplicationLayout extends ApplicationLayout {
} }
ResourceFile dir = applicationRootDirs.iterator().next().getParentFile(); ResourceFile dir = applicationRootDirs.iterator().next().getParentFile();
if (SystemUtilities.isInDevelopmentMode()) { if (SystemUtilities.isInDevelopmentMode() && applicationRootDirs.size() > 1) {
dir = dir.getParentFile(); dir = dir.getParentFile();
} }
return dir; return dir;