Changeset 20093

Timestamp:

2009-07-29T10:08:10+12:00 (15 years ago)

Author:

kjdon

Message:

changed min java version to 1.5 for now. the release needs 1.5. can change it back to 1.4 later. also, add java home/bin to path after setting java_home. and changed a few output statements

File:

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

greenstone3/trunk/gs3-setup.sh

@@ -8 +8 @@
 
 # java_min_version gets passed to search4j as the minimum java version
-java_min_version=1.4.0_00
+java_min_version=1.5.0_00
 
 
@@ -111 +111 @@
     export ANT_HOME
     addtopath PATH "$ANT_HOME/bin"
-    echo "  - Setup ant"
+    echo "  - Setup Greenstone ant ($GSDL3SRCHOME/packages/ant)"
   else
     which ant &> /dev/null
@@ -117 +117 @@
       echo "  - Greenstone 'Ant' package missing - falling back to system Ant"
     else
-      echo "  - NOTE: Greenstone 'Ant' package missing - please install Ant yourself"
+      echo "  - ERROR: Greenstone 'Ant' package missing - please install Ant yourself"
     fi
     echo "    (Greenstone requires Ant 1.7.1 or greater)"
@@ -131 +131 @@
       #bundled java exists, set up
       export JAVA_HOME="$FOUNDJAVAHOME"
+      addtopath PATH "$JAVA_HOME/bin"
       echo "  - Exported JAVA_HOME to $FOUNDJAVAHOME"
   else
-      #no suitible java exists
-      echo "  NOTE: Failed to locate java \($java_min_version or greater\)"
+      #no suitable java exists
+      echo "  ERROR: 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