From dc89db33df8a0515fba0f25d3cdf82fa994f3a4b Mon Sep 17 00:00:00 2001
From: Tobias Bosch
Date: Mon, 6 Jan 2014 14:01:39 -0800
Subject: chore(build): bugfixes to build scripts on Jenkins.

---
 scripts/angular.js/publish.sh |  4 ++--
 scripts/jenkins/master.sh     |  4 ++--
 scripts/jenkins/release.sh    |  7 ++-----
 scripts/utils.inc             | 12 +++++++-----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/scripts/angular.js/publish.sh b/scripts/angular.js/publish.sh
index d72a393f..cd728ee1 100755
--- a/scripts/angular.js/publish.sh
+++ b/scripts/angular.js/publish.sh
@@ -10,7 +10,7 @@ ARG_DEFS=(
   "--action=(prepare|publish)"
  "--next-version-type=(patch|minor|major)"
  "--next-version-name=(.+)"
- "[--no_test=true]"
+ "[--no-test=(true|false)]"
 )
 
 function init {
@@ -29,7 +29,7 @@ function prepare() {
   ./scripts/angular.js/finalize-version.sh
 
   # Build
-  if [[ $NO_TEST ]]; then
+  if [[ $NO_TEST == "true" ]]; then
     grunt package
   else
     ./jenkins_build.sh
diff --git a/scripts/jenkins/master.sh b/scripts/jenkins/master.sh
index d5768f58..e27fa552 100755
--- a/scripts/jenkins/master.sh
+++ b/scripts/jenkins/master.sh
@@ -5,13 +5,13 @@ echo "#### Update master ##############"
 echo "#################################"
 
 ARG_DEFS=(
-  "[--no-test=true]"
+  "[--no-test=(true|false)]"
 )
 
 function build {
   cd ../..
 
-  if [[ $NO_TEST ]]; then
+  if [[ $NO_TEST == "true" ]]; then
     grunt package
   else
     ./jenkins_build.sh
diff --git a/scripts/jenkins/release.sh b/scripts/jenkins/release.sh
index b4eee4c4..2763b128 100755
--- a/scripts/jenkins/release.sh
+++ b/scripts/jenkins/release.sh
@@ -5,16 +5,13 @@ echo "#### Cut release ################"
 echo "#################################"
 
 ARG_DEFS=(
-  "--next_version_type=(patch|minor|major)"
+  "--next-version-type=(patch|minor|major)"
   "--next-version-name=(.+)"
-  "[--no-test=true]"
+  "[--no-test=(true|false)]"
 )
 
 function init {
   NG_ARGS=("$@")
-  if [[ $NO_TEST ]]; then
-    NG_ARGS+=(--no_test=true)
-  fi
 }
 
 function phase {
diff --git a/scripts/utils.inc b/scripts/utils.inc
index 0465de8f..3b0039ed 100644
--- a/scripts/utils.inc
+++ b/scripts/utils.inc
@@ -217,8 +217,8 @@ function git_push_dryrun_proxy {
   export ORIGIN_GIT=$(which git)
 
   function git {
-	  local var
-	  ARGS=("$@")
+	  local ARGS=("$@")
+	  local RC
 	  if [[ $1 == "push" ]]; then
 	    ARGS+=("--dry-run" "--porcelain")
 	    echo "####### START GIT PUSH DRYRUN #######"
@@ -228,9 +228,11 @@ function git_push_dryrun_proxy {
       echo "${ARGS[@]}"
 	  fi
 	  $ORIGIN_GIT "${ARGS[@]}"
+	  RC=$?
 	  if [[ $1 == "push" ]]; then
 	    echo "####### END GIT PUSH DRYRUN #######"
 	  fi
+	  return $RC
   }
 
   export -f git
@@ -240,11 +242,11 @@ function main {
   # normalize the working dir to the directory of the script
   cd $(dirname $0);SCRIPT_DIR=$(pwd)
 
-  ARG_DEFS+=("[--git-push-dryrun=true]" "[--verbose=true]")
+  ARG_DEFS+=("[--git-push-dryrun=(true|false)]" "[--verbose=(true|false)]")
   parseArgs "$@"
 
   # --git_push_dryrun argument
-  if [[ $GIT_PUSH_DRYRUN ]]; then
+  if [[ $GIT_PUSH_DRYRUN == "true" ]]; then
     git_push_dryrun_proxy
   fi
 
@@ -252,7 +254,7 @@ function main {
   set -e
 
   # --verbose argument
-  if [[ $VERBOSE ]]; then
+  if [[ $VERBOSE == "true" ]]; then
     set -x
   fi
 
-- 
cgit v1.2.3