fix a bug in the ./all script when checking out the DP repo

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 40ba27bed6211c8a777a36358d4c24353859678a..e49faeb823f2c6a24597c97f5bcdd2b3f2ade727 100755 (executable)
--- a/all
+++ b/all
@@ -233,7 +233,9 @@ case "$cmd" in
                        else
                                verbose git clone "$url" "$d0/$d"
                                enter "$d0/$d" verbose
-                               verbose git checkout "$branch"
+                               if [ "$branch" != "master" ]; then
+                                       verbose git checkout --track -b "$branch" origin/"$branch"
+                               fi
                                cd "$d0"
                        fi
                done
@@ -433,6 +435,9 @@ case "$cmd" in
        compile)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        TARGETS="sv-debug cl-debug"
+                       if [ -z "$CC" ]; then
+                               export CC=gcc
+                       fi
                else
                        TARGETS="sv-debug cl-debug sdl-debug"
                fi