Changeset 30106

Timestamp:

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

Author:

ak19

Message:

HINT for search4j adjusted after JRE inclusion on Mac Lion.

Location:

main/trunk

Files:

• gli/findjava.sh (modified) (1 diff)
• greenstone3/gs3-server.sh (modified) (1 diff)
• greenstone3/gs3-setup.sh (modified) (2 diffs)

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`"

main/trunk/greenstone3/gs3-server.sh

@@ -104 +104 @@
 # JRE_HOME or JAVA_HOME must be set correctly to run this program
 HINT="`pwd`/packages/jre"
+if [ "$GSDLOS" = "darwin" ] && [ ! -d "$HINT" ]; then
+    HINT=`/usr/libexec/java_home`
+fi
 javapath=`search4j -p "$HINT" -m $java_min_version -e` 
 if [ "$?" == "0" ]; then

main/trunk/greenstone3/gs3-setup.sh

@@ -179 +179 @@
 function checkJava() {
 
+  # we now include a JRE with Mac (Mountain) Lion too, because from Yosemite onwards there's no system Java on Macs
   HINT="`pwd`/packages/jre"
-  if [ $GSDLOS = darwin ]; then
-        HINT=/System/Library/Frameworks/JavaVM.framework/Home
+  if [ "$GSDLOS" = "darwin" ] && [ ! -d "$HINT" ]; then
+      HINT=`/usr/libexec/java_home`
+      # old code used as fallback:
+      if [ ! -d "$HINT" ]; then
+          HINT=/System/Library/Frameworks/JavaVM.framework/Home
+      fi
   fi
 
@@ -188 +193 @@
     FOUNDJAVAHOME="`bin/search4j -p \"$HINT\" -m $java_min_version`"
     if [ "$?" == "0" ]; then
-      #found a suitible java
+      #found a suitable java
       setupJavaAt "$FOUNDJAVAHOME"
     else