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

Timestamp:

2021-10-27T13:01:20+13:00 (2 years ago)

Author:

davidb

Message:

Change of var name from HINT to PRIORITY_HINT to better reflect its role

File:

• main/trunk/greenstone3/gs3-setup.sh (modified) (2 diffs)

main/trunk/greenstone3/gs3-setup.sh

@@ -189 +189 @@
   # we now include a JRE with Mac (Mountain) Lion too, because from Yosemite onwards there's no system Java on Macs
   BUNDLED_JRE="`pwd`/packages/jre"
-  HINT=$BUNDLED_JRE
+  PRIORITY_HINT=$BUNDLED_JRE
 
   if [ "$GSDLOS" = "darwin" ] ; then
     # try $JAVA_HOME first, if it is set
     if [ "x$JAVA_HOME" != "x" ] && [ -d "$JAVA_HOME" ] ; then
-      HINT=$JAVA_HOME
-    elif [ ! -d "$HINT" ] ; then
+      PRIORITY_HINT=$JAVA_HOME
+    elif [ ! -d "$PRIORITY_HINT" ] ; then
     #we test for the existence of bundled_jre - will be present in binary release. Use that if it is there as we know that it works with GS
     # but if its not there, try the following:
     # this will print out the path to java
-    HINT=`/usr/libexec/java_home`
+    PRIORITY_HINT=`/usr/libexec/java_home`
         # old code used as fallback:
     # But actually this is not valid for Mojave and Catalina
-      if [ ! -d "$HINT" ] ; then
-              HINT=/System/Library/Frameworks/JavaVM.framework/Home
+      if [ ! -d "$PRIORITY_HINT" ] ; then
+              PRIORITY_HINT=/System/Library/Frameworks/JavaVM.framework/Home
       fi
       fi
@@ -270 +270 @@
   javaset=false
   if [ -x bin/search4j ] ; then
-      FOUNDJAVAHOME="`bin/search4j -d -p \"$HINT\" -m $java_min_version`"
+      FOUNDJAVAHOME="`bin/search4j -d -p \"$PRIORITY_HINT\" -m $java_min_version`"
       javahome_retval=$?
-      FOUNDJREHOME="`bin/search4j -r -p \"$HINT\" -m $java_min_version`"
+      FOUNDJREHOME="`bin/search4j -r -p \"$PRIORITY_HINT\" -m $java_min_version`"
       jrehome_retval=$?
   fi