From 8b141da0f636b4086e566dc2e03eeb17c6172a5e Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 9 Apr 2016 13:19:40 +0200 Subject: [PATCH] New projects added + some fixes for excluding jratecalc: - new projects jcustomer-core (model + POJOs/POJIs) and jcustomer-lib (remote interface) added - some fixes for excluding jratecalc in many steps Signed-off-by: Roland Haeder --- .jprojects.sh | 1 + fix-project-remotes.sh | 2 +- push-stick.sh | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.jprojects.sh b/.jprojects.sh index e47663b..4575280 100644 --- a/.jprojects.sh +++ b/.jprojects.sh @@ -9,6 +9,7 @@ LIST="jcore jcore-logger-lib jcore-logger-ejb jcoreee \ jletter-core jletter-lib jletter-ejb \ jmailer-ee \ jcore-swing \ + jcustomer-core jcustomer-lib \ jshop-core jshop-ee-lib jshop-ejb \ jshop-receipt-lib jshop-receipt-ejb" diff --git a/fix-project-remotes.sh b/fix-project-remotes.sh index bcb1cc5..ebfb1da 100755 --- a/fix-project-remotes.sh +++ b/fix-project-remotes.sh @@ -20,7 +20,7 @@ MEDIA_PATH="Java Project" for project in ${LIST}; do echo "$0: project='${project}'" - SKIP_TEST="${project:0,9}" + SKIP_TEST="${project:0:9}" if [ "${SKIP_TEST}" = "jratecalc" ] then diff --git a/push-stick.sh b/push-stick.sh index 332b4d0..04321b4 100755 --- a/push-stick.sh +++ b/push-stick.sh @@ -17,23 +17,22 @@ then fi for project in ${LIST}; do - echo "$0: Pushing '${project}' ..." + echo "$0: Processing '${project}',mode='$1' ..." cd "${JPROJECTS_HOME}/${project}" || exit 255 - SKIP_TEST="${project:0,9}" + SKIP_TEST="${project:0:9}" - if [ -z "$2" ] + if [ -z "$2" -o "${SKIP_TEST}" = "jratecalc" ] then - git push --all + echo "$0: Pushing '${project}',mode='$1' ..." + git push --all || exit 255 fi if [ "${SKIP_TEST}" = "jratecalc" ] then echo "$0: Not continuing for jratecalc project '${project}'." continue - fi - - if [ "$1" = "d" ] + elif [ "$1" = "d" ] then git push --all daedalus elif [ "$1" = "t" ] @@ -43,5 +42,6 @@ for project in ${LIST}; do then git push --all upstream fi + cd "${JPROJECTS_HOME}" done -- 2.39.5