mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5699_ghidraffe_fixGhidraGoDevMode--SQUASHED' into Ghidra_11.4

Browse Source
This commit is contained in:
Ryan Kurtz
2025-05-22 10:27:48 -04:00
parent 81d9cbb5ac c85915954c
commit 5ab3df4bf8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Features/GhidraGo/src/main/java/ghidra/GhidraGo.java
View File

@@ -149,25 +149,25 @@ public class GhidraGo implements GhidraLaunchable {
* @throws IOException in the event that the execution failed
*/
private Process startGhidra(GhidraApplicationLayout layout) throws IOException {
ResourceFile file = layout.getApplicationInstallationDir();
ResourceFile file = layout.getApplicationRootDirs().stream().findFirst().get();
Path ghidraRunPath;
if (SystemUtilities.isInDevelopmentMode()) {
if (Platform.CURRENT_PLATFORM.getOperatingSystem() == OperatingSystem.WINDOWS) {
ghidraRunPath = Path.of(file.getAbsolutePath(),
"/ghidra/Ghidra/RuntimeScripts/Windows/ghidraRun.bat");
"/RuntimeScripts/Windows/ghidraRun.bat");
}
else {
ghidraRunPath = Path.of(file.getAbsolutePath(),
"/ghidra/Ghidra/RuntimeScripts/Linux/ghidraRun");
"/RuntimeScripts/Linux/ghidraRun");
}
}
else {
if (Platform.CURRENT_PLATFORM.getOperatingSystem() == OperatingSystem.WINDOWS) {
ghidraRunPath = Path.of(file.getAbsolutePath(), "/ghidraRun.bat");
ghidraRunPath = Path.of(file.getAbsolutePath(), "/../ghidraRun.bat");
}
else {
ghidraRunPath = Path.of(file.getAbsolutePath(), "/ghidraRun");
ghidraRunPath = Path.of(file.getAbsolutePath(), "/../ghidraRun");
}
}