From 40325d93ab0cf12a2c8d41f609f57130d36fef8c Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 5 Apr 2016 16:13:58 +0200 Subject: [PATCH] Added jratecalc (no-public, Cho-Time GmbH project). Signed-off-by: Roland Haeder --- .jprojects.sh | 1 + fix-project-remotes.sh | 9 +++++++++ pull-stick.sh | 2 +- push-stick.sh | 14 +++++++++++--- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.jprojects.sh b/.jprojects.sh index cf33056..e47663b 100644 --- a/.jprojects.sh +++ b/.jprojects.sh @@ -16,6 +16,7 @@ LIST="jcore jcore-logger-lib jcore-logger-ejb jcoreee \ LIST="${LIST} pizzaservice-lib pizzaservice pizzaservice-swing pizzaservice-war \ jjobs-lib jjobs-mailer jjobs-ejb jjobs jjobs-war \ + jratecalc-lib jratecalc-mailer jratecalc-ejb jratecalc jratecalc-war \ addressbook-lib addressbook-mailer addressbook-ejb addressbook addressbook-war addressbook-uml" # Tools repository diff --git a/fix-project-remotes.sh b/fix-project-remotes.sh index 22b4dd0..bcb1cc5 100755 --- a/fix-project-remotes.sh +++ b/fix-project-remotes.sh @@ -19,6 +19,15 @@ MEDIA_NAME2="Transport" MEDIA_PATH="Java Project" for project in ${LIST}; do + echo "$0: project='${project}'" + SKIP_TEST="${project:0,9}" + + if [ "${SKIP_TEST}" = "jratecalc" ] + then + echo "$0: Not fixing URLs for jratecalc project '${project}'." + continue + fi + GIT_URL1="${GIT_USER}@${GIT_SERVER}:${GIT_PATH}/${project}.git" GIT_URL2="${GIT_PATH}/${project}.git" GIT_URL3="${MEDIA_BASE}/${USER}/${MEDIA_NAME2}/${MEDIA_PATH}/${project}.git" diff --git a/pull-stick.sh b/pull-stick.sh index a187860..7f87871 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -12,7 +12,7 @@ for ENTRY in ${LIST}; do fi echo "$0: Pulling '${ENTRY}' ..." - git pull || exit 255 + git pull transport master || exit 255 echo "$0: Rebasing '${ENTRY}' ..." git rebase origin/master || exit 255 cd - diff --git a/push-stick.sh b/push-stick.sh index 4a8ca09..332b4d0 100755 --- a/push-stick.sh +++ b/push-stick.sh @@ -16,15 +16,23 @@ then exit 0 fi -for ENTRY in ${LIST}; do - echo "$0: Pushing '${ENTRY}' ..." - cd "${JPROJECTS_HOME}/${ENTRY}" || exit 255 +for project in ${LIST}; do + echo "$0: Pushing '${project}' ..." + cd "${JPROJECTS_HOME}/${project}" || exit 255 + + SKIP_TEST="${project:0,9}" if [ -z "$2" ] then git push --all fi + if [ "${SKIP_TEST}" = "jratecalc" ] + then + echo "$0: Not continuing for jratecalc project '${project}'." + continue + fi + if [ "$1" = "d" ] then git push --all daedalus -- 2.39.5