autobuild fixes

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 3820aff435f1bb68db8bd3a2886f0c8613251e8c..8b6cd4d59b32ce39eb3ce7eafec4b463a60caa4f 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -232,6 +232,14 @@ for my $m(@{$options->{maps}})
                                }
                        }
                };
+
+               if(defined $shaderlist_new)
+               {
+                       mkdir "$mapdir/scripts";
+                       open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
+                       print $fh $shaderlist_new;
+                       close $fh;
+               }
        }
 
        local $SIG{INT} = sub
@@ -243,14 +251,6 @@ for my $m(@{$options->{maps}})
 
        eval
        {
-               if(defined $shaderlist_new)
-               {
-                       mkdir "$mapdir/scripts";
-                       open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
-                       print $fh $shaderlist_new;
-                       close $fh;
-               }
-
                unlink <$m/lm_*>; # delete old external lightmaps
                q3map2 '-bsp', @{$options->{bsp}},   "$m.map"
                        or die "-bsp: $?";

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 668363650969d147f96b4e25e78d7c4068c3aa34..1e81237a0337e3598410957427dc76202ec4ed1a 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