The last commit from my workplace removed push-stick.sh, which was not intended.

[jprojects-scripts.git] / pull-stick.sh

diff --git a/pull-stick.sh b/pull-stick.sh
index 7f87871af1e076e39093a229afba3070060c3947..1c20816f8ee1f2e16f7d4bca3c46a1df56d15437 100755 (executable)
--- 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 transport master || 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