Changeset 20636 for gsdl/trunk/findjava.sh

Timestamp:

2009-09-18T18:02:25+12:00 (15 years ago)

Author:

ak19

Message:

Better warning message when the findjava scripts have to resort to using what's in JAVA_HOME.

File:

• gsdl/trunk/findjava.sh (modified) (1 diff)

gsdl/trunk/findjava.sh

@@ -17 +17 @@
 
     # Print a warning that we're going to use whatever JAVA_HOME is set (fingers crossed)
-    echo
     if [ "x$gslang" = "x" -o "$gslang" = "en" ]; then
+        echo
         echo "***************************************************************************"
         echo "WARNING: "
-        echo "Found a JAVA_HOME at $JAVA_HOME. Attempting to use this."
-        echo "However, you need to have a Java $MIN_DISPLAY_VERSION or higher installed."
+        echo "Java Runtime not bundled with this Greenstone installation."
+        echo "Using JAVA_HOME: %JAVA_HOME%"
+        echo "(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.)"
         echo "***************************************************************************"
+        echo
     fi
-    echo
     echo "Java:"
     echo $javapath