From 9445d791f3cef181208471b2bd8fc743e41037f6 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 27 Apr 2016 22:55:14 +0200 Subject: [PATCH] Continued a bit: - added new projects addressbook-core and pizzaservice-core - added parameter 's' for not rebasing Signed-off-by: Roland Haeder --- .jprojects.sh | 4 ++-- pull-stick.sh | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.jprojects.sh b/.jprojects.sh index 0f68140..a26eb3a 100644 --- a/.jprojects.sh +++ b/.jprojects.sh @@ -22,10 +22,10 @@ LIST="${LIST} \ # Applications and their special libs/EJBs LIST="${LIST} - pizzaservice-lib pizzaservice-mailer pizzaservice-ejb pizzaservice pizzaservice-swing pizzaservice-war \ + pizzaservice-core pizzaservice-lib pizzaservice-mailer pizzaservice-ejb pizzaservice pizzaservice-swing pizzaservice-war \ jjobs-lib jjobs-mailer jjobs-ejb jjobs jjobs-war \ jratecalc-lib jratecalc-core jratecalc-mailer jratecalc-ejb jratecalc jratecalc-war \ - addressbook-lib addressbook-mailer addressbook-ejb addressbook addressbook-war addressbook-uml" + addressbook-core addressbook-lib addressbook-mailer addressbook-ejb addressbook addressbook-war addressbook-uml" # BROKEN: LIST="${LIST} addressbook-swing" diff --git a/pull-stick.sh b/pull-stick.sh index 1c20816..a0bd4e9 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -31,8 +31,11 @@ for project in ${LIST}; do fi fi - echo "$0: Rebasing '${project}' ..." - git rebase origin/master || exit 255 + if [ "$1" != "s" ] + then + echo "$0: Rebasing '${project}' ..." + git rebase origin/master || exit 255 + fi done echo "$0: All done." -- 2.39.5