Changeset 30106 for main/trunk/gli

Timestamp:

2015-08-13T20:33:28+12:00 (9 years ago)

Author:

ak19

Message:

HINT for search4j adjusted after JRE inclusion on Mac Lion.

File:

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

main/trunk/gli/findjava.sh

@@ -67 +67 @@
 
     # Give search4j a hint to find Java depending on the platform
-    if [ "$GSDLOS" = "linux" ]; then
-    HINT=`cd "$GSDLHOME";pwd`/packages/jre
-    elif [ "$GSDLOS" = "darwin" ]; then
-    # http://java.dzone.com/articles/java-findingsetting
+    # we now include a JRE with Mac (Mountain) Lion, because from Yosemite onwards there's no system Java on Macs
+    HINT=`cd "$GSDLHOME";pwd`/packages/jre    
+    
+    # we can't use boolean operator -a to do the AND, since it doesn't "short-circuit" if the first test fails
+    # see http://www.tldp.org/LDP/abs/html/comparison-ops.html
+    if [ "$GSDLOS" = "darwin" ] && [ ! -d "$HINT" ]; then
+        # http://java.dzone.com/articles/java-findingsetting
     # explains that /usr/libexec/java_home will print the default JDK
     # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard
     # (run `/usr/libexec/java_home -v 1.7` to find a specific version)
     HINT=`/usr/libexec/java_home`
-    fi  
+    fi
     
     javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`"