Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler-autobuild

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 668363650969d147f96b4e25e78d7c4068c3aa34..8249686daa0559d1f321b09f9dd749cbf2da36d5 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -4,6 +4,8 @@ bspdir="$PWD/bspfiles"
 mkdir -p "$bspdir"
 cd data/xonotic-maps.pk3dir
 git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
+       git reset --hard
+       git clean -xfd
        git checkout "$HASH"
        for F in maps/*.map.options; do
                if ! [ -f "$F" ]; then
@@ -22,7 +24,7 @@ git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
                        cd maps
                        ../../../misc/tools/xonotic-map-compiler "$M" -noshaderlist `head -n 1 "../$F"` 2>&1 | tee "$M.log"
                )
-               zip -9r "$bspdir/$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "gfx/${M}_mini.tga"
+               zip -9r "$bspdir/$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
        done
 done
 git checkout master