X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=1c20816f8ee1f2e16f7d4bca3c46a1df56d15437;hp=a1878608921bcb253621cd0ece95140d8ca5b96f;hb=6edf322867134dcd7a99cc40a5cd9f58cc6548ab;hpb=612c0632dbfccc85c923aa5c8b85a5f8db69901b diff --git a/pull-stick.sh b/pull-stick.sh index a187860..1c20816 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -2,18 +2,38 @@ . ./.jprojects.sh || exit 255 -for ENTRY in ${LIST}; do - cd "${ENTRY}" || exit 255 +for project in ${LIST}; do + if [ ! -d "${JPROJECTS_HOME}/${project}" ] + then + echo "$0: Project '${project}' does not exist." + continue + fi + + cd "${JPROJECTS_HOME}/${project}" || exit 255 if [ "$1" = "c" ] then - echo "$0: Checkout '${ENTRY}' ..." + echo "$0: Checkout '${project}' ..." git checkout -- . fi - echo "$0: Pulling '${ENTRY}' ..." - git pull || exit 255 - echo "$0: Rebasing '${ENTRY}' ..." + SKIP_TEST="${project:0:9}" + + echo "$0: Pulling '${project}' ..." + if [ "${SKIP_TEST}" = "jratecalc" ] + then + git pull --all || exit 255 + else + git pull transport master + if [ "$?" != "0" ] + then + git pull --all || exit 255 + fi + fi + + echo "$0: Rebasing '${project}' ..." git rebase origin/master || exit 255 - cd - done + +echo "$0: All done." +exit 0