Changeset 20083

Timestamp:

2009-07-27T10:55:30+12:00 (14 years ago)

Author:

oranfry

Message:

sped up this script

File:

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

greenstone3/trunk/gs3-setup.sh

@@ -111 +111 @@
       echo "  - Greenstone 'Ant' package missing - falling back to system Ant"
     else
-      echo "  NOTE: Greenstone 'Ant' package missing - please install Ant yourself"
+      echo "  - NOTE: Greenstone 'Ant' package missing - please install Ant yourself"
     fi
+    echo "    (Greenstone requires Ant 1.7.1 or greater)"
   fi
 
@@ -152 +153 @@
 function addtopath() {
   eval "PV=\$$1"
-  if [ `isinpath "$PV" "$2"` == "false" ]; then
-    #echo "$1 += $2"
-    if [ "$PV" == "" ]; then
-      cmd="$1=\"$2\""
-    else
-      cmd="$1=\"$2:\$$1\""
-    fi
-    eval $cmd
-    eval "export $1"
+  #echo "$1 += $2"
+  if [ "$PV" == "" ]; then
+    cmd="$1=\"$2\""
+  else
+    cmd="$1=\"$2:\$$1\""
   fi
+  eval $cmd
+  eval "export $1"
 }