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

Timestamp:

2009-08-13T18:50:14+12:00 (15 years ago)

Author:

ak19

Message:

Another condition for finding ant, useful when we've obtained GS3 from SVN: there is no ant 1.7.1 bundled with it, but before doing the which ant test, check ANT_HOME instead.

File:

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

greenstone3/trunk/gs3-setup.sh

@@ -117 +117 @@
 
   #ant
+  ANT_VERSION=1.7.1
   if [ -x "$GSDL3SRCHOME/packages/ant/bin/ant" ]; then
     ANT_HOME="$GSDL3SRCHOME/packages/ant"
@@ -123 +124 @@
     echo "  - Setup Greenstone ant ($GSDL3SRCHOME/packages/ant)"
   else
-    which ant &> /dev/null
-    if [ "$?" == "0" ]; then
-      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"
-      echo "           Note that Greenstone requires Ant 1.7.1 or greater"
-    fi
-
+      # check if ANT_HOME is already set
+      if [ "$ANT_HOME" != "" ]; then
+      echo "  - Falling back to using existing ANT_HOME which is set to: $ANT_HOME"
+      echo "           Note that Greenstone requires Ant $ANT_VERSION or greater"
+      # export ANT_HOME
+      # Add ANT_HOME/bin to PATH if it does not already contain it
+      ANT_BIN=$ANT_HOME/bin
+      if [[ $PATH != *$ANT_BIN* ]]; then
+          addtopath PATH "$ANT_BIN"
+      fi
+      else
+      which ant &> /dev/null
+      if [ "$?" == "0" ]; then
+          echo "  - WARNING: Greenstone 'Ant' package missing - falling back to system Ant"
+          echo "             Note that Greenstone requires Ant $ANT_VERSION or greater"
+      else
+          echo "  - ERROR: Greenstone 'Ant' package missing - please install Ant yourself"
+          echo "           Note that Greenstone requires Ant $ANT_VERSION or greater"
+      fi
+      fi
   fi