Changeset 35669 for main/trunk/greenstone3/gs3-setup.sh
- Timestamp:
- 2021-10-22T16:53:41+13:00 (2 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/gs3-setup.sh
r35668 r35669 291 291 # For linux, the bundled JRE ought to be of a bitness matching this OS. 292 292 if [ "$javaset" != "true" ] && [ -d "$BUNDLED_JRE" ] ; then 293 setJavaIfOK "$DEBUG" "$bitness" "$BUNDLED_JRE" " bundledJRE"293 setJavaIfOK "$DEBUG" "$bitness" "$BUNDLED_JRE" "Bundled-JRE" 294 294 if [ "$?" = "0" ] ; then javaset="true"; fi 295 295 fi … … 412 412 if [ "$bitness" != "-1" ] && [ "$DEBUG" = "true" ] ; then 413 413 # java matches GS bitness 414 if [ [ "$JDKorJRE" = *"bundled"* ]] ; then414 if [ "$JDKorJRE" = "Bundled-JRE" ] ; then 415 415 echo "*** Changing to use Greenstone's $bitness-bit $JDKorJRE at $PATHTOJAVA" 416 416 else … … 422 422 423 423 elif [ "$bitness" != "-1" ] && [ "$DEBUG" = "true" ] ; then 424 if [ [ "$JDKorJRE" = *"bundled"* ]] ; then424 if [ "$JDKorJRE" = "Bundled-JRE" ] ; then 425 425 echo " The $JDKorJRE java is an incompatible bit architecture" 426 426 else … … 483 483 484 484 BUNDLED_JRE="`pwd`/packages/jre" 485 if [ [ "$JRE_HOME" = *"$BUNDLED_JRE"* ]] ; then485 if [ "$JRE_HOME" = "$BUNDLED_JRE" ] ; then 486 486 msg="the bundled" 487 487 fi
Note:
See TracChangeset
for help on using the changeset viewer.