Changeset 35709
- Timestamp:
- 2021-10-27T13:01:20+13:00 (2 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/gs3-setup.sh
r35669 r35709 189 189 # we now include a JRE with Mac (Mountain) Lion too, because from Yosemite onwards there's no system Java on Macs 190 190 BUNDLED_JRE="`pwd`/packages/jre" 191 HINT=$BUNDLED_JRE191 PRIORITY_HINT=$BUNDLED_JRE 192 192 193 193 if [ "$GSDLOS" = "darwin" ] ; then 194 194 # try $JAVA_HOME first, if it is set 195 195 if [ "x$JAVA_HOME" != "x" ] && [ -d "$JAVA_HOME" ] ; then 196 HINT=$JAVA_HOME197 elif [ ! -d "$ HINT" ] ; then196 PRIORITY_HINT=$JAVA_HOME 197 elif [ ! -d "$PRIORITY_HINT" ] ; then 198 198 #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 199 199 # but if its not there, try the following: 200 200 # this will print out the path to java 201 HINT=`/usr/libexec/java_home`201 PRIORITY_HINT=`/usr/libexec/java_home` 202 202 # old code used as fallback: 203 203 # But actually this is not valid for Mojave and Catalina 204 if [ ! -d "$ HINT" ] ; then205 HINT=/System/Library/Frameworks/JavaVM.framework/Home204 if [ ! -d "$PRIORITY_HINT" ] ; then 205 PRIORITY_HINT=/System/Library/Frameworks/JavaVM.framework/Home 206 206 fi 207 207 fi … … 270 270 javaset=false 271 271 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`" 273 273 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`" 275 275 jrehome_retval=$? 276 276 fi
Note:
See TracChangeset
for help on using the changeset viewer.