Changeset 15138 for greenstone3/trunk/gs3-setup.sh

Timestamp:

2008-03-27T13:39:04+13:00 (16 years ago)

Author:

oranfry

Message:

if during gs3-setup no (appropriate) java is found except the bundled one, export JAVA_HOME to point to the bundled one

File:

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

greenstone3/trunk/gs3-setup.sh

@@ -7 +7 @@
 #   - java
 
-java_min_version=1.4.0_00
+java_min_version=1.5.0_00
 
 
@@ -111 +111 @@
     which ant &> /dev/null
     if [ "$?" != "0" ]; then
-            ANT_HOME=$GSDLSRCHOME/packages/ant
+            ANT_HOME=$GSDL3SRCHOME/packages/ant
             PATH=$ANT_HOME/bin:$PATH
         echo "  - Setup ant"
@@ -123 +123 @@
 function checkJava() {
     echo "Checking Java"
-  #check java
+
   bin/search4j -m $java_min_version &> /dev/null
   if [ "$?" != "0" ]; then
-    echo "  - Failed to locate java ($java_min_version or greater)"
-        bin/search4j &> /dev/null
-        if [ "$?" == "0" ]; then echo "  (It looks like you hava java but it's too old)"; fi
-        echo "  - Please set JAVA_HOME or JRE_HOME to point to an appropriate java"
-    echo "    And add JAVA_HOME/bin or JRE_HOME/bin to your PATH"
+
+        #java is not set up already
+      bin/search4j -m $java_min_version -h jre &> /dev/null
+      if [ "$?" == "0" ]; then
+            #bundled java exists, set up
+            export JAVA_HOME=`pwd`/jre
+        echo "  - Exported JAVA_HOME to point to bundled java"
+        else
+            #no java exists
+        echo "  - Failed to locate java ($java_min_version or greater)"
+            bin/search4j &> /dev/null; if [ "$?" == "0" ]; then echo "  (It looks like you hava java but it's too old)"; fi
+            echo "  - Please set JAVA_HOME or JRE_HOME to point to an appropriate java"
+        echo "    And add JAVA_HOME/bin or JRE_HOME/bin to your PATH"
+        fi
+
     else
+
+        #java is already set up
         echo "  - Found java at: `bin/search4j -m $java_min_version`"
+
   fi
     echo