Changeset 15134

Timestamp:

2008-03-26T16:29:16+13:00 (16 years ago)

Author:

oranfry

Message:

look for ant during gs3-setup instead of mucking around during installation

File:

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

greenstone3/trunk/gs3-setup.sh

@@ -61 +61 @@
 
     ## adjustments to users (existing) environment ##
+
+    #PATH
     if [ `isinpath "$PATH" "$GSDL3SRCHOME/bin"` == "false" ]; then
         PATH=$GSDL3SRCHOME/bin/script:$GSDL3SRCHOME/bin:$PATH
@@ -71 +73 @@
     fi
 
+    #CLASSPATH
     if [ `isinpath "$CLASSPATH" "$GSDL3HOME/WEB-INF/classes"` == "false" ]; then
         CLASSPATH=$GSDL3HOME/WEB-INF/classes:$GSDL3SRCHOME/resources/java:$CLASSPATH
@@ -94 +97 @@
     fi
 
+    #LD_LIBRARY_PATH
     if [ `isinpath "$LD_LIBRARY_PATH" "$GSDL3SRCHOME/lib/jni"` == "false" ]; then
         LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GSDL3SRCHOME/lib/jni
@@ -103 +107 @@
         echo "  - LD_LIBRARY_PATH already correct"
     fi
+
+    #ant
+    which ant &> /dev/null
+    if [ "$?" != "0" ]; then
+            ANT_HOME=$GSDLSRCHOME/packages/ant
+            PATH=$ANT_HOME/bin:$PATH
+        echo "  - Setup ant"
+    else
+        echo "  - Ant already setup"
+    fi
+
     echo
 }