Changeset 36844 for gs2-extensions

Timestamp:

2022-10-21T10:46:46+13:00 (18 months ago)

Author:

davidb

Message:

Changes to mean scripts can be run without explicit source setup.bash first

Location:

gs2-extensions/video-and-audio/trunk/src

Files:

• CASCADE-MAKE-NG.sh (modified) (1 diff)
• setup.bash (modified) (1 diff)

gs2-extensions/video-and-audio/trunk/src/CASCADE-MAKE-NG.sh

@@ -11 +11 @@
     sleep 10
 fi
+
+source setup.bash
 
 if [ "x$GSDLHOME" = "x" ] ; then

gs2-extensions/video-and-audio/trunk/src/setup.bash

@@ -6 +6 @@
 fulldir=${fulldir%/.}
 
+if [ "x$GSDLHOME" = "x" ] && [ "x$GSDL3SRCHOME" = "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=
+  else
+    # backstop
+    GSDLOS=`uname -s | tr '[A-Z]' '[a-z]'`
+    # check for running bash under cygwin
+    if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ; then
+      GSDLOS=windows
+    fi 
+  fi
+fi
+
+
+
+#source cascade-make/bin/script/test-setup.bash
 source cascade-make/lib/cascade-lib.bash