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 a1878608921bcb253621cd0ece95140d8ca5b96f..edc6784f1e198a4a4a4eaa8251578c0eb6144c96 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 || exit 255
-       echo "$0: Rebasing '${ENTRY}' ..."
-       git rebase origin/master || exit 255
-       cd -
+       echo "$0: Pulling '${project}' ..."
+
+       git pull -S origin master
+       git pull -S upstream master
+       git pull -S transport master
+
+       if [ "$?" != "0" ]
+       then
+               git pull --all || exit 255
+       fi
+
+       if [ "$1" != "s" ]
+       then
+               echo "$0: Rebasing '${project}' ..."
+               git rebase origin/master || exit 255
+       fi
 done
+
+echo "$0: All done."
+exit 0