From: Ben Soares <b.soares@dundee.ac.uk>
Date: Tue, 27 Jun 2023 16:39:40 +0000 (+0100)
Subject: JAL-3416 Don't forget java bin in the correct java home
X-Git-Tag: Release_2_11_3_0~8^2~36^2~3
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=322fdd83cdce7b1fe595d67874f76ea41ff727ea

JAL-3416 Don't forget java bin in the correct java home
---

diff --git a/src/jalview/bin/Launcher.java b/src/jalview/bin/Launcher.java
index a87d322..9ddfa0d 100644
--- a/src/jalview/bin/Launcher.java
+++ b/src/jalview/bin/Launcher.java
@@ -102,6 +102,10 @@ public class Launcher
     {
       javaBin = javaBinDir + "Jalview";
     }
+    if (javaBin == null && checkJVMSymlink(javaBinDir + "java"))
+    {
+      javaBin = javaBinDir + "java";
+    }
     if (javaBin == null)
     {
       javaBin = "java";