Changeset 35669

Timestamp:

2021-10-22T16:53:41+13:00 (2 years ago)

Author:

davidb

Message:

Elimination for final if-tests, to be more 'sh' fieldly

File:

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

main/trunk/greenstone3/gs3-setup.sh

@@ -291 +291 @@
   # For linux, the bundled JRE ought to be of a bitness matching this OS.
   if [ "$javaset" != "true" ] && [ -d "$BUNDLED_JRE" ] ; then
-      setJavaIfOK "$DEBUG" "$bitness" "$BUNDLED_JRE" "bundled JRE"
+      setJavaIfOK "$DEBUG" "$bitness" "$BUNDLED_JRE" "Bundled-JRE"
       if [ "$?" = "0" ] ; then javaset="true"; fi
   fi
@@ -412 +412 @@
     if [ "$bitness" != "-1" ] && [ "$DEBUG" = "true" ] ; then
         # java matches GS bitness
-        if [[ "$JDKorJRE" = *"bundled"* ]] ; then
+        if [ "$JDKorJRE" = "Bundled-JRE" ] ; then
         echo "*** Changing to use Greenstone's $bitness-bit $JDKorJRE at $PATHTOJAVA"
         else
@@ -422 +422 @@
     
     elif [ "$bitness" != "-1" ] && [ "$DEBUG" = "true" ] ; then
-    if [[ "$JDKorJRE" = *"bundled"* ]] ; then
+    if [ "$JDKorJRE" = "Bundled-JRE" ] ; then
         echo "    The $JDKorJRE java is an incompatible bit architecture"
     else
@@ -483 +483 @@
    
     BUNDLED_JRE="`pwd`/packages/jre"    
-    if [[ "$JRE_HOME" = *"$BUNDLED_JRE"* ]] ; then
+    if [ "$JRE_HOME" = "$BUNDLED_JRE" ] ; then
     msg="the bundled"
     fi