From 6f3c2d363da81826d7bc31a56f6045b02ebe2a97 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Tue, 17 Oct 2023 07:57:52 -0400 Subject: [PATCH] GP-0: LaunchSupport can now find Eclipse JustJ JDK on Linux --- .../src/main/java/ghidra/launch/LinuxJavaFinder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LinuxJavaFinder.java b/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LinuxJavaFinder.java index 355e21de93..232e8a07b0 100644 --- a/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LinuxJavaFinder.java +++ b/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LinuxJavaFinder.java @@ -50,7 +50,7 @@ public class LinuxJavaFinder extends JavaFinder { @Override protected File getJdkHomeFromJavaHome(File javaHomeDir) { - if (javaHomeDir.getName().equals("jre")) { + if (javaHomeDir.getName().equals("jre") && !javaHomeDir.getAbsolutePath().contains("org.eclipse.justj")) { return javaHomeDir.getParentFile(); } return javaHomeDir;