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

Timestamp:

2016-08-25T22:06:55+12:00 (8 years ago)

Author:

davidb

Message:

Greenstone code was overriding custom Java_Home set on Mac. We want to control that Java_Home to 1.7 to match the JRE we're including so first preference for Java_Home HINT to search4j is any JAVA_HOME already set.

File:

• main/trunk/greenstone3/gs3-setup.sh (modified) (1 diff)

main/trunk/greenstone3/gs3-setup.sh

@@ -181 +181 @@
   # 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" ] && [ ! -d "$HINT" ]; then
-      HINT=`/usr/libexec/java_home`
-      # old code used as fallback:
-      if [ ! -d "$HINT" ]; then
-          HINT=/System/Library/Frameworks/JavaVM.framework/Home
+  
+  #if [ "$GSDLOS" = "darwin" ] && [ ! -d "$HINT" ]; then
+  if [ "$GSDLOS" = "darwin" ]; then
+      if [ "$JAVA_HOME" != "" ] && [ -d "$JAVA_HOME" ]; then
+      HINT=$JAVA_HOME
+      elif [ ! -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
   fi