fix self-reexec on ./all clean --reclone

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 1a0d23f4c0ecf19b19ded7128c4f7689b1bac396..cb7f224da84d6243dcc5bf4dc93426a835530b64 100755 (executable)
--- a/all
+++ b/all
@@ -498,13 +498,16 @@ case "$cmd" in
                                allow_pull=false
                        elif [ x"$1" = x"-p" ]; then
                                fix_config=true
-                               if [ x"$base" != x"ssh://xonotic@git.xonotic.org/" ]; then
-                                       pushbase=ssh://xonotic@git.xonotic.org/
-                               fi
+                               pushbase=ssh://xonotic@git.xonotic.org/
+                       elif [ x"$1" = x"-ps" ]; then
+                               fix_config=true
+                               pushbase=ssh://xonotic@git.xonotic.org/
+                       elif [ x"$1" = x"-ph" ]; then
+                               fix_config=true
+                               pushbase=http://git.xonotic.org/login/xonotic/
                        elif [ x"$1" = x"-s" ]; then
                                fix_config=true
                                base=ssh://xonotic@git.xonotic.org/
-                               pushbase=
                        elif [ x"$1" = x"-g" ]; then
                                fix_config=true
                                base=git://git.xonotic.org/xonotic/
@@ -549,7 +552,7 @@ case "$cmd" in
                        best)
                                # if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
                                case "$base" in
-                                       ssh://*)
+                                       ssh://*|*/login/*)
                                                pushbase=$base
                                                base=git://git.xonotic.org/xonotic/
                                                ;;
@@ -1375,7 +1378,6 @@ case "$cmd" in
                                msg "Unknown arg: $X"
                        fi
                        found=true
-                       shift
                done
                if ! $found; then
                        rmuntracked=true
@@ -1504,7 +1506,7 @@ case "$cmd" in
                fi
                verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
                        verbose cd Xonotic
-                       verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id
+                       verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
                        verbose tar xvf -
                        verbose rm -rf misc/builddeps
                        verbose mv misc/buildfiles/win32/* . || true
@@ -1543,6 +1545,16 @@ case "$cmd" in
                        verbose sh autogen.sh
                }
                rm -f Xonotic/key_15.d0pk
+               {
+                       verbose cd mapping
+                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223.tar.bz2
+                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223-win32-7z.exe
+                       for X in *-7z.exe; do
+                               7za x "$X"
+                               rm -f "$X"
+                       done
+                       # TODO possibly include other tools?
+               }
                ;;
        release-compile-run)
                host=$1
@@ -1868,7 +1880,8 @@ case "$cmd" in
                        Xonotic/fteqcc \
                        Xonotic/server \
                        Xonotic/key_0.d0pk \
-                       Xonotic/data/font-nimbussansl-$stamp.pk3
+                       Xonotic/data/font-nimbussansl-$stamp.pk3 \
+                       Xonotic/data/font-xolonium-$stamp.pk3
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
                verbose mkzip0 Xonotic-$stamp.zip \
                        Xonotic/data/xonotic-$stamp-data.pk3 \
@@ -1886,6 +1899,9 @@ case "$cmd" in
                        Xonotic/data/xonotic-$stamp-maps-high.pk3 \
                        Xonotic/data/xonotic-$stamp-music.pk3 \
                        Xonotic/data/xonotic-$stamp-nexcompat-high.pk3
+               verbose mkzip0 Xonotic-$stamp-mappingsuppport.zip \
+                       Xonotic/mapping \
+                       Xonotic/data/xonotic-$stamp-maps-low.pk3 # TODO add a Radiant build
                ;;
        release)
                verbose "$SELF" release-prepare