Changeset 8901

Timestamp:

2005-01-17T16:35:59+13:00 (19 years ago)

Author:

mdewsnip

Message:

Changed scripts to use a hopefully much more robust method for checking that the version of Java is new enough to run the GLI: run a tiny Java program (CheckJavaVersion).

Location:

trunk/gli

Files:

• gli.sh (modified) (2 diffs)
• gli4gs3.sh (modified) (1 diff)

trunk/gli/gli.sh

@@ -194 +194 @@
 
 ## -- Check the version of Java is new enough (1.4.0 or higher) to run the GLI --
-javaversion=`$javapath -version 2>&1 | sed -n 's/^java version \"\(.*\)\"/\1/p'`
-jvmajor=`echo $javaversion | sed -n 's/^\([0-9]*\).*$/\1/p'`
-jvminor=`echo $javaversion | sed -n 's/^[0-9]*\.\([0-9]*\).*$/\1/p'`
-
-jok=1
-if [ $jvmajor -lt 1 ] ; then
-    jok=0
-fi
-if [ $jvmajor -eq 1 ] && [ $jvminor -lt 4 ] ; then
-    jok=0
-fi
-if [ $jok -eq 0 ] ; then
+`$javapath CheckJavaVersion > /dev/null`
+if [ $? -ne 2 ] ; then
     echo
     if [ "$glilang" == "es" ]; then
@@ -236 +226 @@
 ## ---- Check that the GLI has been compiled ----
 if [ ! -f "classes/org/greenstone/gatherer/GathererProg.class" ] && [ ! -f "GLI.jar" ]; then
-    echo
+    echo
     if [ "$glilang" == "es" ]; then
     echo "Usted necesita compilar la Interfaz de la Biblioteca Digital Greenstone"

trunk/gli/gli4gs3.sh

@@ -246 +246 @@
 
 ## -- Check the version of Java is new enough (1.4.0 or higher) to run the GLI --
-javaversion=`$javapath -version 2>&1 | sed -n 's/^java version \"\(.*\)\"/\1/p'`
-jvmajor=`echo $javaversion | sed -n 's/^\([0-9]*\).*$/\1/p'`
-jvminor=`echo $javaversion | sed -n 's/^[0-9]*\.\([0-9]*\).*$/\1/p'`
-
-jok=1
-if [ $jvmajor -lt 1 ] ; then
-    jok=0
-fi
-if [ $jvmajor -eq 1 ] && [ $jvminor -lt 4 ] ; then
-    jok=0
-fi
-if [ $jok -eq 0 ] ; then
+`$javapath CheckJavaVersion > /dev/null`
+if [ $? -ne 2 ] ; then
     echo
     if [ "$glilang" == "es" ]; then