Detect calling "all" via e.g. ../../all and chdir where it SHOULD be

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 76263e203c698c62c2c8fffaf6283ea3c2528e5b..6011b54e52ee9f13782f10816c98b2c36088ff08 100755 (executable)
--- a/all
+++ b/all
@@ -51,6 +51,12 @@ fi
 cmd=$1
 shift
 
+case "$0" in
+       */*)
+               cd "${0%/*}"
+               ;;
+esac
+
 d0=`pwd`
 case "$cmd" in
        update|pull)
@@ -163,9 +169,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 +181,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