Copy also to dist and execute build-all

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

diff --git a/pull-stick.sh b/pull-stick.sh
index 3dc73ede6f77a919068729e3d2d4df8897f5e39f..edc6784f1e198a4a4a4eaa8251578c0eb6144c96 100755 (executable)
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -17,16 +17,23 @@ for project in ${LIST}; do
                git checkout -- .
        fi
 
-       SKIP_TEST="${project:0:9}"
-
        echo "$0: Pulling '${project}' ..."
-       if [ "${SKIP_TEST}" = "jratecalc" ]
+
+       git pull -S origin master
+       git pull -S upstream master
+       git pull -S transport master
+
+       if [ "$?" != "0" ]
        then
                git pull --all || exit 255
-       else
-               git pull transport master || exit 255
        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."
+exit 0