Changeset 3832 for trunk/gsdl3

Timestamp:

2003-03-10T15:34:40+13:00 (21 years ago)

Author:

mdewsnip

Message:

Now checks $JAVA_HOME is set, Java programs exist, and Java version is 1.4.

File:

• trunk/gsdl3/setup.bash (modified) (1 diff)

trunk/gsdl3/setup.bash

@@ -49 +49 @@
   export LD_LIBRARY_PATH
 
-  #set up java - should this be done here?
-  JAVA_HOME=/usr/local/share/j2sdk1.4.0/
-  export JAVA_HOME
-  PATH=/usr/local/share/j2sdk1.4.0/bin:$PATH
-  export PATH
-
   #set up java options for catalina
   CATALINA_OPTS="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DGSDLHOME=$GSDLHOME -DPATH=$PATH"
   export CATALINA_OPTS
 
-  echo "Your environment has successfully been set up to run Greenstone3"
-  if test ! -n "$GSDLHOME" ; then
-   echo "However, if you want to run greenstone 2 compatible building, then you need to 'source setup.bash' in  the home directory of your greenstone 2 installation, and then re-source this script"
+  # Make sure JAVA_HOME is set
+  if test ! -n "$JAVA_HOME" ; then
+    echo "Error: JAVA_HOME variable not set."
+  # Make sure the Java executable is in JAVA_HOME/bin/
+  elif test ! -f "$JAVA_HOME/bin/java"; then
+    echo "Error: Java executable not found."
+  # Make sure the Java version is 1.4 (should really check for 1.4 or higher)
+  elif test ! -n "`$JAVA_HOME/bin/java -version 2>&1 | grep 'version \"1.4'`" ; then
+    echo "Error: Java version 1.4.0 required."
+  else
+    echo "Your environment has successfully been set up to run Greenstone3"
+    if test ! -n "$GSDLHOME" ; then
+      echo "However, if you want to run greenstone 2 compatible building, then you need to 'source setup.bash' in  the home directory of your greenstone 2 installation, and then re-source this script"
+    fi
   fi
-