From 68f907d0f42f9fb31aa123a59f4e771db50d73c3 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 2 Apr 2013 16:20:22 -0400 Subject: [PATCH] shouldn't exit in a sourced function, doofus. so, couldn't use check_result and just need to check status of each return instead. --- customizing/fred/build_cak0l.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/customizing/fred/build_cak0l.sh b/customizing/fred/build_cak0l.sh index 02e206ce..303b8fa2 100644 --- 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 } -- 2.34.1