Changeset 2719 for trunk/gsdl

Timestamp:

2001-08-29T15:17:30+12:00 (23 years ago)

Author:

jrm21

Message:

added some tests to make sure we are sourced, not run. Also check if
we have already been sourced, and added a check for bash on cygwin.

File:

• trunk/gsdl/setup.bash (modified) (1 diff)

trunk/gsdl/setup.bash

@@ -1 @@
-export GSDLHOME=`pwd`
-export GSDLOS=`uname -s | tr A-Z a-z`
-if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ;
-then
-# they are different => we are running bash under cygwin
-GSDLOS=windows
+# if this file is executed, /bin/sh is used, as we don't start with #!
+# this should work under ash, bash, zsh, ksh, sh style shells.
+
+# make sure we are sourced, and not run
+
+if test "$0" != "`echo $0 | sed s/setup\.bash//`" ; then
+# if $0 contains "setup.bash" we've been run... $0 is shellname if sourced.
+# One exception is zsh has an option to set it temporarily to the script name
+  if test -z "$ZSH_NAME" ; then
+  # we aren't using zsh
+  gsdl_not_sourced=true
+  fi
 fi
-export PATH=$PATH:$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS
-export MANPATH=$MANPATH:$GSDLHOME/packages/mg/man
-echo "Your environment has successfully been set up to run Greenstone"
+
+if test -n "$gsdl_not_sourced" ; then
+  echo "    Error: Make sure you source this script, not execute it. Eg:"
+  echo "        $ source setup.bash"
+  echo "    or"
+  echo "        $ . ./setup.bash"
+  echo "    not"
+  echo "        $ ./setup.bash"
+elif test -n "$GSDLHOME" ; then
+  echo "Your environment is already set up for Greenstone!"
+elif test ! -f setup.bash ; then
+  echo "You must source the script from within the Greenstone home directory"
+else
+  export GSDLHOME=`pwd`
+  export GSDLOS=`uname -s | tr A-Z a-z`
+  # they for running bash under cygwin
+  if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ;
+  then
+    GSDLOS=windows
+  fi
+  export PATH=$PATH:$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS
+  export MANPATH=$MANPATH:$GSDLHOME/packages/mg/man
+  echo "Your environment has successfully been set up to run Greenstone"
+fi
+unset gsdl_not_sourced