Changeset 20305

Timestamp:

2009-08-17T15:15:40+12:00 (15 years ago)

Author:

oranfry

Message:

made gs3-setup logic for ant a bit flatter

File:

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

greenstone3/trunk/gs3-setup.sh

@@ -48 +48 @@
     localgs3sourcehome="`pwd`"
     if [ "$GSDL3SRCHOME" == "$localgs3sourcehome" ]; then
-    echo "Your environment is already set up for Greenstone3"
-    return 1
+      echo "Your environment is already set up for Greenstone3"
+      return 1
     fi
     echo "Your environment was set up for Greenstone 3 in $GSDL3SRCHOME."
@@ -76 +76 @@
   #change this if external tomcat
   TOMCAT_HOME="$GSDL3SRCHOME/packages/tomcat"
-
 
   ## adjustments to users (existing) environment ##
@@ -124 +123 @@
     echo "  - Setup Greenstone ant ($GSDL3SRCHOME/packages/ant)"
   else
-      # 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
+    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"
+    elif [ "ANT_HOME" != "" ]; then
+      addtopath PATH "$ANT_HOME/bin"
+      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
 
@@ -162 +153 @@
   if test -d "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/ghostscript"; then
     addtopath PATH "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/ghostscript/bin"
-    GS_LIB="$GSDL3SRCHOME/gs2build/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/lib"
-    export GS_LIB
-    GS_FONTPATH="$GSDL3SRCHOME/gs2build/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/Resource/Font"
-    export GS_FONTPATH
+    GS_LIB="$GSDL3SRCHOME/gs2build/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/lib"
+    export GS_LIB
+    GS_FONTPATH="$GSDL3SRCHOME/gs2build/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/Resource/Font"
+    export GS_FONTPATH
     echo "  - Setup GhostScript"
   fi