Changeset 33005

Timestamp:

2019-04-09T18:00:28+12:00 (5 years ago)

Author:

davidb

Message:

When testing on Peyman's Mac, findjava.sh was locating the system installed JDK over the custom JDK even though JAVA_HOME was set.

File:

• main/trunk/gli/findjava.sh (modified) (1 diff)

main/trunk/gli/findjava.sh

@@ -80 +80 @@
     # run silently in case no system java installed, as it will result in a confusing message about there being no java
     # when we're still searching for java 
-    macHINT=`/usr/libexec/java_home 2>&1`
-    #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
-        #/System/Library/Frameworks/JavaVM.framework/Home
-    status=$?
+    if [ "x$JAVA_HOME" != "x" ]; then
+      HINT="$JAVA_HOME"
+    else 
+      #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+          #/System/Library/Frameworks/JavaVM.framework/Home
+
+      macHINT=`/usr/libexec/java_home 2>&1`
+      status=$?
         # if no java installed, then HINT will contain:
         #  Unable to find any JVMs matching version "(null)".
         #  No Java runtime present, try --request to install.
         # and the status of running /usr/libexec/java_home will not be 0 but 1:
-    if [ "$status" = "0" ]; then
-        HINT=$macHINT
-        else
-        echo "No system Java on this mac..."
+      if [ "$status" = "0" ]; then
+          HINT=$macHINT
+      else
+          echo "No system Java on this mac..."
+      fi
     fi
     fi