autodownload compiled maps on "compile"

diff --git a/all b/all
index 524e470e3dffaed0276efeb751637ad157a2e882..1aaef60338a9e4f015df37b8fa726e73bb4b71ad 100755 (executable)
--- a/all
+++ b/all
@@ -240,6 +240,9 @@ case "$cmd" in
                        fi
                done
                ;;
+       update-maps)
+               misc/tools/xonotic-map-compiler-autobuild download
+               ;;
        checkout|switch)
                remote=$1
                branch=$2
@@ -501,6 +504,7 @@ case "$cmd" in
                for T in $TARGETS; do
                        verbose make $MAKEFLAGS "$@" "$T"
                done
+               verbose "$SELF" update-maps
                ;;
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index bab7adc14e87ea17045ea48bf2fa3856fd017768..d0ef82e22b1409d0a57fac3a16290ecfcdc8f557 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -2,7 +2,7 @@
 
 set -e
 
-bspdir="$PWD/bspfiles"
+bspdir="$PWD/data"
 url=http://141.2.16.23/~xonotic/bsp-autobuilds/
 
 bspoutdir="$HOME/public_html/bsp-autobuilds/"
@@ -76,8 +76,8 @@ case "$1" in
                ;;
        download)
                rm -rf "$bspdir.old"
-               mv "$bspdir" "$bspdir.old" || true
-               mkdir -p "$bspdir"
+               mkdir -p "$bspdir" "$bspdir.old"
+               mv "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3 "$bspdir.old"/ || true
                cd data/xonotic-maps.pk3dir
                allmaps getthemap "$url" "$bspdir.old" "$bspdir"
                echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"