Changeset 30252 for gs2-extensions

Timestamp:

2015-09-21T10:21:02+12:00 (9 years ago)

Author:

jmt12

Message:

Adding support for the extension living in Greenstone3, and make script more robust/secure against things like spaces in filepaths

File:

• gs2-extensions/tdb/trunk/setup.bash (modified) (2 diffs)

gs2-extensions/tdb/trunk/setup.bash

@@ -1 +1 @@
 
-extdesc="TDB flavoured editing"
+extdesc="TDB Database support"
 
 full_setup=`pwd`/${BASH_SOURCE}
-fulldir=${full_setup%/*}
-fulldir=${fulldir%/.}
+fulldir="${full_setup%/*}"
+fulldir="${fulldir%/.}"
 
-if [ "x$GSDLHOME" = "x" ] ; then
-  if [ -e ../../setup.bash ] ; then
-    export gsopt_noexts=1 && pushd ../.. && source setup.bash && popd
-    export gsopt_noexts=
-  elif [ -e ../../gs3-setup.sh ] ; then
-    export gsopt_noexts=1 && pushd ../.. && source gs3-setup.sh && popd
-    export gsopt_noexts=
-  fi
+GSDLVER=0
 
+# Test for one of the homes, otherwise we need to source a top-level setup
+if [ "${GSDL3HOME}x" != "x" ] ; then
+    GSDLVER=3
+fi
+if [ "${GSDLHOME}x" != "x" ] ; then
+    GSDLVER=2
+fi
+
+if [ "$GSDLVER" == "0" ] ; then
+    export gsopt_noexts=1
+    CWD=`pwd`
+    cd ../..
+    if [ -f "./gs3-setup.sh" ] ; then
+    source ./gs3-setup.sh
+    GSDLVER=3
+    else
+    source ./setup.bash
+    GSDLVER=2
+    fi
+    cd "${CWD}"
+    unset gsopt_noexts
 fi
 
@@ -20 +34 @@
 
   export TDBEDITOS=`uname -s | tr '[A-Z]' '[a-z]' | sed 's/\([0-9]\+\)\?_.*$//'`
-  export GEXTTDBEDIT=$fulldir
-  export GEXTTDBEDIT_INSTALLED=$GEXTTDBEDIT/$GSDLOS
+  export GEXTTDBEDIT="${fulldir}"
+  export GEXTTDBEDIT_INSTALLED="${GEXTTDBEDIT}/${GSDLOS}"
 
-  export PATH=$GEXTTDBEDIT_INSTALLED/bin:$fulldir/bin/script:$PATH
+  export PATH="${GEXTTDBEDIT_INSTALLED}/bin:${fulldir}/bin/script:${PATH}"
 
   if [ "x$LD_LIBRARY_PATH" = "x" ] ; then
-    export LD_LIBRARY_PATH=$GEXTTDBEDIT_INSTALLED/lib
+    export LD_LIBRARY_PATH="${GEXTTDBEDIT_INSTALLED}/lib"
   else
-    export LD_LIBRARY_PATH=$GEXTTDBEDIT_INSTALLED/lib:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH="${GEXTTDBEDIT_INSTALLED}/lib:${LD_LIBRARY_PATH}"
   fi
 
-  extdir=${GEXTTDBEDIT##*/}
+  extdir="${GEXTTDBEDIT##*/}"
 
-  if [ "x$GSDLEXTS" = "x" ] ; then
-    export GSDLEXTS=$extdir
-  else 
-    export GSDLEXTS=$GSDLEXTS:$extdir
+  if [ "${GSDLVER}" = "3" ] ; then
+      if [ "x${GSDL3EXTS}" = "x" ] ; then
+      export GSDL3EXTS="${extdir}"
+      else
+      export GSDL3EXTS="${GSDL3EXTS}:${extdir}"
+      fi
+  else
+      if [ "x${GSDLEXTS}" = "x" ] ; then
+      export GSDLEXTS="${extdir}"
+      else
+      export GSDLEXTS="${GSDLEXTS}:${extdir}"
+      fi
   fi
 
-  echo "+Your environment is now setup for $extdesc to Greenstone"
+
+
+  echo "+Your environment is now setup for $extdesc for Greenstone${GSDLVER}"
 else
-  echo "+Your environment is already setup for $extdesc to Greenstone"
+  echo "+Your environment is already setup for $extdesc for Greenstone${GSDLVER}"
 fi