Index: other-projects/nightly-tasks/crons-and-scripts/macos_gsbins_cron.sh.TEMPLATE
===================================================================
--- other-projects/nightly-tasks/crons-and-scripts/macos_gsbins_cron.sh.TEMPLATE	(revision 32393)
+++ other-projects/nightly-tasks/crons-and-scripts/macos_gsbins_cron.sh.TEMPLATE	(revision 32393)
@@ -0,0 +1,74 @@
+echo "@@@ Ejecting disk 1 so that wrapping step (.dmg creation) won't suddenly fail"
+
+# ensure disk1 is unmounted
+hdutil eject /dev/disk1
+
+# Set up the correct versions of svn and Java if the correct versions aren't already on the PATH
+# However, this is only for any svn and java commands in this file
+# The release kit uses envi to set up its environment at
+# envi/etc/environment.pl and envi/etc/tasks/snapshot/environment.pl
+export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+echo "@@@ JAVA_HOME set to $JAVA_HOME"
+#export PATH=/opt/subversion/bin/:$JAVA_HOME/bin:$PATH
+#export HINT=/System/Library/Frameworks/JavaVM.framework/Versions/Current
+
+env >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;
+
+# update the release-kits
+echo "@@@ Updating the release-kits"
+svn up /Volumes/Research/nzdl/release-kits
+
+
+# Finally, generate the caveats
+echo "Generating the caveats"
+
+cd /Volumes/Research/nzdl/envi/bin
+
+# if a param is passed in and it's 2, generate GS2 caveat
+# if a param is passed in and it's 3, generate GS3 caveat
+# if the first param is 'release' and the 2nd is the release number (e.g. 3.09rc2),
+# generate a GS2 or GS3 release binary as indicated by the 2nd parameter
+# if no param is passed in, or if it's other than 2 or 3 or release or help,
+# generate everything (GS2 and GS3 caveats and stables)
+if test ! -z "$1" ; then
+	if test "$1" == "-h" || test "$1" == "--help" || test "$1" == "-?" ; then
+		echo "*************************************************"
+		echo "Usage: $0 <1|2|release <gs-release-version>[rc#]>"
+		echo "     - $0 by itself will generate caveats for 2 followed by 3"
+		echo "     - $0 2 will generate the caveat for 2"
+		echo "     - $0 3 will generate the caveat for 3"
+		echo "     - $0 release will print out the usage for generating a release"
+		echo "     - $0 release 3.09 will generate the 3.09 release binary"
+		echo "     - $0 release 3.09rc2 will generate the binary for 3.09 release candidate 2"
+		echo "     - $0 -h|--help|-? will print these usage instructions"
+		echo "*************************************************"
+	elif test "$1" == "2" ; then
+	    echo "Caveat 2";
+		./envi gs2-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;
+	elif test "$1" == "3" ; then
+	    echo "Caveat 3";
+		./envi gs3-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;		
+	elif test "$1" == "release" ; then
+		if test -z "$2" ; then
+		    echo ""
+			echo "USAGE: Run as $0 $1 <gs-release-version>[rc#]"
+		    echo ""
+		else
+    		echo "$*"; # "Release folder"
+			export TASK_NAME=release;
+			./envi $* >> /Volumes/Research/nzdl/logs/release-$2.log 2>&1;
+		fi
+	else
+		echo "Unrecognised parameter $1 passed in. Run $0 --help|-h|-? for usage"
+	fi
+else
+    echo "Both caveats";
+	./envi caveats >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;
+fi
+
+
+
+#./envi caveats >> /Volumes/Research/nzdl/logs/caveats.log 2>&1
+#./envi gs3-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1
+#./envi gs2-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1
+
Index: other-projects/nightly-tasks/crons-and-scripts/macos_nightly_cron.sh.TEMPLATE
===================================================================
--- other-projects/nightly-tasks/crons-and-scripts/macos_nightly_cron.sh.TEMPLATE	(revision 32392)
+++ 	(revision )
@@ -1,74 +1,0 @@
-echo "@@@ Ejecting disk 1 so that wrapping step (.dmg creation) won't suddenly fail"
-
-# ensure disk1 is unmounted
-hdutil eject /dev/disk1
-
-# Set up the correct versions of svn and Java if the correct versions aren't already on the PATH
-# However, this is only for any svn and java commands in this file
-# The release kit uses envi to set up its environment at
-# envi/etc/environment.pl and envi/etc/tasks/snapshot/environment.pl
-export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
-echo "@@@ JAVA_HOME set to $JAVA_HOME"
-#export PATH=/opt/subversion/bin/:$JAVA_HOME/bin:$PATH
-#export HINT=/System/Library/Frameworks/JavaVM.framework/Versions/Current
-
-env >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;
-
-# update the release-kits
-echo "@@@ Updating the release-kits"
-svn up /Volumes/Research/nzdl/release-kits
-
-
-# Finally, generate the caveats
-echo "Generating the caveats"
-
-cd /Volumes/Research/nzdl/envi/bin
-
-# if a param is passed in and it's 2, generate GS2 caveat
-# if a param is passed in and it's 3, generate GS3 caveat
-# if the first param is 'release' and the 2nd is the release number (e.g. 3.09rc2),
-# generate a GS2 or GS3 release binary as indicated by the 2nd parameter
-# if no param is passed in, or if it's other than 2 or 3 or release or help,
-# generate everything (GS2 and GS3 caveats and stables)
-if test ! -z "$1" ; then
-	if test "$1" == "-h" || test "$1" == "--help" || test "$1" == "-?" ; then
-		echo "*************************************************"
-		echo "Usage: $0 <1|2|release <gs-release-version>[rc#]>"
-		echo "     - $0 by itself will generate caveats for 2 followed by 3"
-		echo "     - $0 2 will generate the caveat for 2"
-		echo "     - $0 3 will generate the caveat for 3"
-		echo "     - $0 release will print out the usage for generating a release"
-		echo "     - $0 release 3.09 will generate the 3.09 release binary"
-		echo "     - $0 release 3.09rc2 will generate the binary for 3.09 release candidate 2"
-		echo "     - $0 -h|--help|-? will print these usage instructions"
-		echo "*************************************************"
-	elif test "$1" == "2" ; then
-	    echo "Caveat 2";
-		./envi gs2-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;
-	elif test "$1" == "3" ; then
-	    echo "Caveat 3";
-		./envi gs3-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;		
-	elif test "$1" == "release" ; then
-		if test -z "$2" ; then
-		    echo ""
-			echo "USAGE: Run as $0 $1 <gs-release-version>[rc#]"
-		    echo ""
-		else
-    		echo "$*"; # "Release folder"
-			export TASK_NAME=release;
-			./envi $* >> /Volumes/Research/nzdl/logs/release-$2.log 2>&1;
-		fi
-	else
-		echo "Unrecognised parameter $1 passed in. Run $0 --help|-h|-? for usage"
-	fi
-else
-    echo "Both caveats";
-	./envi caveats >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;
-fi
-
-
-
-#./envi caveats >> /Volumes/Research/nzdl/logs/caveats.log 2>&1
-#./envi gs3-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1
-#./envi gs2-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1
-
