Changeset 35709


Ignore:
Timestamp:
2021-10-27T13:01:20+13:00 (6 weeks ago)
Author:
davidb
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-setup.sh

    r35669 r35709  
    189189  # we now include a JRE with Mac (Mountain) Lion too, because from Yosemite onwards there's no system Java on Macs
    190190  BUNDLED_JRE="`pwd`/packages/jre"
    191   HINT=$BUNDLED_JRE
     191  PRIORITY_HINT=$BUNDLED_JRE
    192192
    193193  if [ "$GSDLOS" = "darwin" ] ; then
    194194    # try $JAVA_HOME first, if it is set
    195195    if [ "x$JAVA_HOME" != "x" ] && [ -d "$JAVA_HOME" ] ; then
    196       HINT=$JAVA_HOME
    197     elif [ ! -d "$HINT" ] ; then
     196      PRIORITY_HINT=$JAVA_HOME
     197    elif [ ! -d "$PRIORITY_HINT" ] ; then
    198198    #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
    199199    # but if its not there, try the following:
    200200    # this will print out the path to java
    201     HINT=`/usr/libexec/java_home`
     201    PRIORITY_HINT=`/usr/libexec/java_home`
    202202        # old code used as fallback:
    203203    # But actually this is not valid for Mojave and Catalina
    204       if [ ! -d "$HINT" ] ; then
    205               HINT=/System/Library/Frameworks/JavaVM.framework/Home
     204      if [ ! -d "$PRIORITY_HINT" ] ; then
     205              PRIORITY_HINT=/System/Library/Frameworks/JavaVM.framework/Home
    206206      fi
    207207      fi
     
    270270  javaset=false
    271271  if [ -x bin/search4j ] ; then
    272       FOUNDJAVAHOME="`bin/search4j -d -p \"$HINT\" -m $java_min_version`"
     272      FOUNDJAVAHOME="`bin/search4j -d -p \"$PRIORITY_HINT\" -m $java_min_version`"
    273273      javahome_retval=$?
    274       FOUNDJREHOME="`bin/search4j -r -p \"$HINT\" -m $java_min_version`"
     274      FOUNDJREHOME="`bin/search4j -r -p \"$PRIORITY_HINT\" -m $java_min_version`"
    275275      jrehome_retval=$?
    276276  fi
Note: See TracChangeset for help on using the changeset viewer.