SOme fixes for ../../all

[xonotic/xonotic.git] / all

diff --git a/all b/all
index c062d95684653c1a63a93d5f63d1b403c71da1c7..e72fda09bae6e74561a3c5f3b0c9fb4084e25b4e 100755 (executable)
--- a/all
+++ b/all
@@ -2,9 +2,32 @@
 
 set -e
 
+msg()
+{
+       echo "\e[1m$*\e[m"
+}
+
+self=`cksum "$0"`
+checkself()
+{
+       self_new=`cksum "$0"`
+       if [ x"$self" != x"$self_new" ]; then
+               msg "./all has changed."
+               if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
+                       msg "Rerunning the requested operation to make sure."
+                       export XONOTIC_FORBID_RERUN_ALL=1
+                       exec "$0" "$@"
+               else
+                       msg "Please try $0 update, and then retry your requested operation."
+                       exit 1
+               fi
+       fi
+       return 0
+}
+
 verbose()
 {
-       echo "\e[1m+ $@\e[m"
+       msg "+ $*"
        "$@"
 }
 
@@ -16,6 +39,8 @@ repos_urls="
        data/xonotic-nexcompat.pk3dir
        darkplaces
        fteqcc@git://github.com/Blub/qclib.git
+       div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
+       netradiant
 "
 
 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
@@ -26,6 +51,13 @@ fi
 cmd=$1
 shift
 
+d00=`pwd`
+case "$0" in
+       */*)
+               cd "${0%/*}"
+               ;;
+esac
+
 d0=`pwd`
 case "$cmd" in
        update|pull)
@@ -56,6 +88,9 @@ case "$cmd" in
                                                ;;
                                esac
                                verbose git pull
+                               cd "$d00"
+                               checkself "$0" "$@"
+                               cd "$d0/$d"
                                verbose git remote prune origin
                                cd "$d0"
                        else
@@ -82,6 +117,8 @@ case "$cmd" in
                        else
                                verbose git checkout master
                        fi
+                       cd "$d00"
+                       checkself "$0" "$@"
                        cd "$d0"
                done
                if ! $exists; then
@@ -109,7 +146,7 @@ case "$cmd" in
                                cd "$d0/$d"
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Branch in $d?"
+                                       echo "Branch in \"$d\"?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
@@ -134,10 +171,21 @@ case "$cmd" in
                        cd "$d0/$d"
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
-                       a=
+                       if git diff HEAD | grep .; then
+                               # we have uncommitted changes
+                               a=
+                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                                       echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+                                       read -r a
+                               done
+                               if [ x"$a" = x"y" ]; then
+                                       verbose git commit -a
+                               fi
+                       fi
                        if git log "origin/$r".."$r" | grep .; then
+                               a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Push $r in $d?"
+                                       echo "Push \"$r\" in \"$d\"?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then