Changeset 17469

Timestamp:

2008-10-03T11:19:19+13:00 (16 years ago)

Author:

oranfry

Message:

small fix relating to what we report to the user

File:

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

greenstone3/trunk/gs3-setup.sh

@@ -126 +126 @@
 
   HINT=`pwd`/packages/jre
-  bin/search4j -p $HINT -m $java_min_version &> /dev/null
+  FOUNDJAVAHOME=`bin/search4j -p $HINT -m $java_min_version`
   if [ "$?" != "0" ]; then
 
     #java is not set up already
-    FOUNDJAVAHOME=`bin/search4j -p $HINT -m $java_min_version`
     if [ "$?" == "0" ]; then
       #bundled java exists, set up
@@ -138 +137 @@
       #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
+      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"
@@ -146 +146 @@
 
     #java is already set up
-    echo "  - Found java at: `bin/search4j -m $java_min_version`"
+    echo "  - Found java at: $FOUNDJAVAHOME"
 
   fi