Changeset 30106 for main/trunk/greenstone3/gs3-setup.sh

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/greenstone3/gs3-setup.sh (modified) (2 diffs)

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