update to SDL 1.2.14

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 920396b4ffe33a68e9235bfc615ee7882f527e71..9480f29f64ab5508a1095ecc7cdc0bdd6101b18a 100755 (executable)
--- a/all
+++ b/all
@@ -25,7 +25,6 @@ case "$0" in
                case "`uname`" in
                        MINGW*|Win*)
                                # Windows hates users. So this script has to copy itself elsewhere first...
-                               tname=
                                cp "$SELF" ../all.xonotic.sh
                                export WE_HATE_OUR_USERS=1
                                exec ../all.xonotic.sh "$@"
@@ -138,14 +137,14 @@ esac
 
 repourl()
 {
-       t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
-       if [ -n "$t" ]; then
-               case "$t" in
+       repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
+       if [ -n "$repo_t" ]; then
+               case "$repo_t" in
                        *://*)
-                               echo "$t"
+                               echo "$repo_t"
                                ;;
                        *)
-                               echo "$base$t"
+                               echo "$base$repo_t"
                                ;;
                esac
        else
@@ -159,9 +158,9 @@ repourl()
 
 repobranch()
 {
-       t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
-       if [ -n "$t" ]; then
-               echo "$t"
+       repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
+       if [ -n "$repo_t" ]; then
+               echo "$repo_t"
        else
                echo "master"
        fi
@@ -170,7 +169,6 @@ repobranch()
 repoflags()
 {
        echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
-       echo "$t"
 }
 
 repos=`for d in $repos; do
@@ -535,7 +533,7 @@ case "$cmd" in
                                exit 1
                        fi
                fi
-               set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
+               set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@"
 
                # if pulseaudio is running: USE IT
                if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@ -732,6 +730,7 @@ case "$cmd" in
                                                                reportecho4 "--> test failed, postponed"
                                                        fi
                                                else
+                                                       echo "MERGING"
                                                        case ",`repoflags "$d"`," in
                                                                *,svn,*)
                                                                        # we do quite a mess here... luckily we know $org