From: Roland Haeder Date: Mon, 18 Apr 2016 18:12:10 +0000 (+0200) Subject: Again jratecalc (Cho-Time GmbH -specific project) needs to be separted out from ... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3ea09997d2be966c72d675632c45f7d03788c90b;p=jprojects-scripts.git Again jratecalc (Cho-Time GmbH -specific project) needs to be separted out from "Open Source" projects. Signed-off-by: Roland Haeder --- diff --git a/pull-stick.sh b/pull-stick.sh index bca9694..3dc73ed 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -6,7 +6,7 @@ for project in ${LIST}; do if [ ! -d "${JPROJECTS_HOME}/${project}" ] then echo "$0: Project '${project}' does not exist." - continue; + continue fi cd "${JPROJECTS_HOME}/${project}" || exit 255 @@ -17,8 +17,16 @@ for project in ${LIST}; do git checkout -- . fi + SKIP_TEST="${project:0:9}" + echo "$0: Pulling '${project}' ..." - git pull transport master || exit 255 + if [ "${SKIP_TEST}" = "jratecalc" ] + then + git pull --all || exit 255 + else + git pull transport master || exit 255 + fi + echo "$0: Rebasing '${project}' ..." git rebase origin/master || exit 255 done