Changeset 32401 for other-projects/nightly-tasks/crons-and-scripts/macos/macos_gsbins_cron.sh.TEMPLATE

Timestamp:

2018-08-30T20:26:47+12:00 (6 years ago)

Author:

ak19

Message:

Introduced BASEDIR variable

File:

• other-projects/nightly-tasks/crons-and-scripts/macos/macos_gsbins_cron.sh.TEMPLATE (modified) (5 diffs)

other-projects/nightly-tasks/crons-and-scripts/macos/macos_gsbins_cron.sh.TEMPLATE

@@ -4 +4 @@
 hdutil eject /dev/disk1
 
+# BASEDIR is the parent folder of envi and release-kits (assuming they share a parent folder)
+BASEDIR=/Users/Shared/RELEASES
+
 # 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
+#export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+export JAVA_HOME=$BASEDIR/JDK7u72
 echo "@@@ JAVA_HOME set to $JAVA_HOME"
-#export PATH=/opt/subversion/bin/:$JAVA_HOME/bin:$PATH
+export PATH=$BASEDIR/subversion/bin:$JAVA_HOME/bin:$PATH
 #export HINT=/System/Library/Frameworks/JavaVM.framework/Versions/Current
 
-env >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;
+env >> $BASEDIR/logs/caveats.log 2>&1;
 
 # update the release-kits
 echo "@@@ Updating the release-kits"
-svn up /Volumes/Research/nzdl/release-kits
+svn up $BASEDIR/release-kits
 
 
@@ -23 +27 @@
 echo "Generating the caveats"
 
-cd /Volumes/Research/nzdl/envi/bin
+cd $BASEDIR/envi/bin
 
 # if a param is passed in and it's 2, generate GS2 caveat
@@ -45 +49 @@
     elif test "$1" == "2" ; then
         echo "Caveat 2";
-        ./envi gs2-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;
+        ./envi gs2-caveat >> $BASEDIR/logs/caveats.log 2>&1;
     elif test "$1" == "3" ; then
         echo "Caveat 3";
-        ./envi gs3-caveat >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;      
+        ./envi gs3-caveat >> $BASEDIR/logs/caveats.log 2>&1;        
     elif test "$1" == "release" ; then
         if test -z "$2" ; then
@@ -57 +61 @@
             echo "$*"; # "Release folder"
             export TASK_NAME=release;
-            ./envi $* >> /Volumes/Research/nzdl/logs/release-$2.log 2>&1;
+            ./envi $* >> $BASEDIR/logs/release-$2.log 2>&1;
         fi
     else
@@ -64 +68 @@
 else
     echo "Both caveats";
-    ./envi caveats >> /Volumes/Research/nzdl/logs/caveats.log 2>&1;
+    ./envi caveats >> $BASEDIR/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
+#./envi caveats >> $BASEDIR/logs/caveats.log 2>&1
+#./envi gs3-caveat >> $BASEDIR/logs/caveats.log 2>&1
+#./envi gs2-caveat >> $BASEDIR/logs/caveats.log 2>&1