Continued a bit:

- added new projects addressbook-core and pizzaservice-core
- added parameter 's' for not rebasing

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/.jprojects.sh b/.jprojects.sh
index 0f68140f0c475077cd4579d866bd2fd3020eab80..a26eb3a02fc20bf7c677767eb13c0e8ec1a731e8 100644 (file)
--- 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 1c20816f8ee1f2e16f7d4bca3c46a1df56d15437..a0bd4e9dc328812291792f1b098fc44cd92eb020 100755 (executable)
--- 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."