added jrecruiter for Galdora e.K

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

diff --git a/pull-stick.sh b/pull-stick.sh
index f8b783453032570727ac67a0c70c9782df56af1e..a0bd4e9dc328812291792f1b098fc44cd92eb020 100755 (executable)
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -24,11 +24,18 @@ for project in ${LIST}; do
        then
                git pull --all || exit 255
        else
-               git pull transport master || exit 255
+               git pull transport master
+               if [ "$?" != "0" ]
+               then
+                       git pull --all || exit 255
+               fi
        fi
 
-       echo "$0: Rebasing '${project}' ..."
-       git rebase origin/master || exit 255
+       if [ "$1" != "s" ]
+       then
+               echo "$0: Rebasing '${project}' ..."
+               git rebase origin/master || exit 255
+       fi
 done
 
 echo "$0: All done."