No exit here

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

diff --git a/pull-stick.sh b/pull-stick.sh
index bca96943000365aec93aa476fb188e2b134ebbba..1c20816f8ee1f2e16f7d4bca3c46a1df56d15437 100755 (executable)
--- 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,23 @@ 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
+               if [ "$?" != "0" ]
+               then
+                       git pull --all || exit 255
+               fi
+       fi
+
        echo "$0: Rebasing '${project}' ..."
        git rebase origin/master || exit 255
 done
+
+echo "$0: All done."
+exit 0