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

Timestamp:

2009-08-11T17:48:44+12:00 (15 years ago)

Author:

oranfry

Message:

made gs3-setup.sh work even without search4j compiled

File:

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

greenstone3/trunk/gs3-setup.sh

@@ -123 +123 @@
     which ant &> /dev/null
     if [ "$?" == "0" ]; then
-      echo "  - Greenstone 'Ant' package missing - falling back to system Ant"
+      echo "  - WARNING: Greenstone 'Ant' package missing - falling back to system Ant"
+      echo "             Note that Greenstone requires Ant 1.7.1 or greater"
     else
       echo "  - ERROR: Greenstone 'Ant' package missing - please install Ant yourself"
-    fi
-    echo "    (Greenstone requires Ant 1.7.1 or greater)"
+      echo "           Note that Greenstone requires Ant 1.7.1 or greater"
+    fi
+
   fi
 
@@ -138 +140 @@
         HINT=/System/Library/Frameworks/JavaVM.framework/Home
   fi
-  FOUNDJAVAHOME="`bin/search4j -p \"$HINT\" -m $java_min_version`"
-  if [ "$?" == "0" ]; then
-      #bundled java exists, set up
-      export JAVA_HOME="$FOUNDJAVAHOME"
-      addtopath PATH "$JAVA_HOME/bin"
-      echo "  - Exported JAVA_HOME to $FOUNDJAVAHOME"
+
+  #if search4j is present, use it
+  if [ -x bin/search4j ] ; then
+    FOUNDJAVAHOME="`bin/search4j -p \"$HINT\" -m $java_min_version`"
+    if [ "$?" == "0" ]; then
+      #found a suitible java
+      setupJavaAt "$FOUNDJAVAHOME"
+    else
+      #no suitable java exists
+      echo "  - ERROR: Failed to locate java $java_min_version or greater"
+      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
+
+  #otherwise manually try the hint
+  elif [ -d "$HINT" ]; then
+      #found a suitible java
+      setupJavaAt "$HINT"
+
+  #lastly, check if java already setup
+  elif [ "$JAVA_HOME" != "" ] && [ "`which java`" == "$JAVA_HOME/bin/java" ]; then
+    echo "  - Using java at $JAVA_HOME"
+  elif [ "$JRE_HOME" != "" ] && [ "`which java`" == "$JRE_HOME/bin/java" ]; then
+    echo "  - Using java at $JRE_HOME"
+  #failing all that, print a warning
   else
-      #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
-      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
+    #no suitable java exists
+    echo "  - ERROR: Failed to locate java"
+    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
+}
+
+function setupJavaAt() {
+  export JAVA_HOME="$1"
+  addtopath PATH "$JAVA_HOME/bin"
+  echo "  - Exported JAVA_HOME to $JAVA_HOME"
 }