Changeset 20189

Timestamp:

2009-08-10T12:03:41+12:00 (14 years ago)

Author:

kjdon

Message:

added a test for setup already sourced, and don't run again if it was the same greenstone. if it has been sourced for a differnet greenstone then print a message and carry on. exit changed to return otherwise it kills the shell in a sourced script

File:

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

greenstone3/trunk/gs3-setup.sh

@@ -35 +35 @@
   if test ! -f gs3-setup.sh ; then
     echo "You must source the script from within the Greenstone home directory"
-    exit 1
-  fi
-
+    return 1
+  fi
+  return 0
+}
+
+# if GSDL3SRCHOME is set, then we assume that we have already sourced the 
+# script so don't do it again. UNLESS, GSDL3SRCHOME doesn't match the 
+# current directory in which case it was a different gs3 installation, so lets
+# do it now.x
+function testAlreadySourced() {
+  if [ ! -z "$GSDL3SRCHOME" ]; then 
+    localgs3sourcehome="`pwd`"
+    if [ "$GSDL3SRCHOME" == "$localgs3sourcehome" ]; then
+    echo "Your environment is already set up for Greenstone3"
+    return 1
+    fi
+    echo "Your environment was set up for Greenstone 3 in $GSDL3SRCHOME."
+    echo "Overwriting that set up for the current Greenstone 3 in $localgs3sourcehome"
+  fi
+  return 0
 }
 
@@ -170 +187 @@
 }
 
+# Note: use return not exit from a sourced script otherwise it kills the shell
 echo
 testSource
+if [ "$?" == "1" ]; then
+return
+fi
+testAlreadySourced
+if [ "$?" == "1" ]; then
+return
+fi
 setGS3ENV
 checkJava