shouldn't exit in a sourced function, doofus. so, couldn't use check_result and...

to check status of each return instead.

diff --git a/customizing/fred/build_cak0l.sh b/customizing/fred/build_cak0l.sh
index 02e206cee6a34d1d36418a6b25384d0bb79980f5..303b8fa27275f5bc794eea08735a4070591bcbe9 100644 (file)
--- a/customizing/fred/build_cak0l.sh
+++ b/customizing/fred/build_cak0l.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"  # for check_result.
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 
 function build_xsede()
 {
   pushd ~/xsede/code/cak0l/trunk
-  check_result "entering trunk directory"
+  if [ $? -ne 0 ]; then return 1; fi
   echo "Build starting at: $(date)"
   \rm -rf unit-test-reports
   ant -Dbuild.targetArch=64 build
-  check_result "building the trunk"
+  if [ $? -ne 0 ]; then return 1; fi
   # fix memory limits.
 #hmmm: clean these up.
   if [ -f runContainer.sh ]; then
@@ -36,7 +36,7 @@ function rebuild_xsede()
 {
   pushd ~/xsede/code/cak0l/trunk
   ant clean
-  check_result "cleaning the trunk"
+  if [ $? -ne 0 ]; then return 1; fi
   popd
   build_xsede
 }