Changeset 30128 for main

Timestamp:

2015-08-24T17:21:50+12:00 (9 years ago)

Author:

ak19

Message:

Bringing findjava for gs2 (used by gs2-setup.sh) up to speed with changes to GS3 to use bundled JRE on Mac.

Location:

main/trunk

Files:

• gli/findjava.sh (modified) (1 diff)
• greenstone2/findjava.sh (modified) (1 diff)

main/trunk/gli/findjava.sh

@@ -56 +56 @@
     echo "Java Runtime Environment (version $MIN_DISPLAY_VERSION or greater) before running the"
     echo "$PROGNAME."
-    echo "If you have Java intalled on your machine please set the environment variable JAVA_HOME."
+    echo "If you have Java installed on your machine please set the environment variable JAVA_HOME."
     fi
     return 1

main/trunk/greenstone2/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
-    # explains that /usr/libexec/java_home will print out the default JDK
+    # 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`
-
     #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
         #/System/Library/Frameworks/JavaVM.framework/Home
-    fi  
+    fi
     
     javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`"