Changeset 32012 for main/trunk

Timestamp:

2017-09-28T22:33:53+13:00 (7 years ago)

Author:

ak19

Message:

Correction. Discovered issue in srcdist situation

File:

• main/trunk/greenstone2/setup.bash (modified) (1 diff)

main/trunk/greenstone2/setup.bash

@@ -330 +330 @@
         echo "setup.bash: Could not find Java in the environment or installation."
         echo "Set JAVA_HOME or JRE_HOME, and put it on the PATH, if working with Java tools like Lucene."
-    elif [ "x$javahome" != "x$BUNDLED_JRE" ]; then
+    elif [[ "x$javahome" != "x" && "x$javahome" != "x$BUNDLED_JRE" ]]; then
         if [ "x$JAVA_HOME" = "x" ]; then
         # if Java env vars not already set, then set them to the $javahome found