SOme fixes for ../../all

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 76263e203c698c62c2c8fffaf6283ea3c2528e5b..e72fda09bae6e74561a3c5f3b0c9fb4084e25b4e 100755 (executable)
--- a/all
+++ b/all
@@ -51,6 +51,13 @@ fi
 cmd=$1
 shift
 
+d00=`pwd`
+case "$0" in
+       */*)
+               cd "${0%/*}"
+               ;;
+esac
+
 d0=`pwd`
 case "$cmd" in
        update|pull)
@@ -81,7 +88,7 @@ case "$cmd" in
                                                ;;
                                esac
                                verbose git pull
-                               cd "$d0"
+                               cd "$d00"
                                checkself "$0" "$@"
                                cd "$d0/$d"
                                verbose git remote prune origin
@@ -110,8 +117,9 @@ case "$cmd" in
                        else
                                verbose git checkout master
                        fi
-                       cd "$d0"
+                       cd "$d00"
                        checkself "$0" "$@"
+                       cd "$d0"
                done
                if ! $exists; then
                        echo "The requested branch was not found in any repository."
@@ -163,9 +171,9 @@ 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
@@ -175,6 +183,7 @@ case "$cmd" in
                                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\"?"
                                        read -r a