xonotic-map-compiler-autobuild: don't abort the "download" action if xonotic-maps...

[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 e14cc58d09ae941ffbc2932b2882ccfe4eac2734..0b5cd720e4671f04d8937b933df95d802f01bf1c 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -7,7 +7,7 @@ url_http=http://beta.xonotic.org/autobuild-bsp/
 url_ssh=xonotic-beta:autobuild-bsp/
 build_cachedir="$HOME/xonotic-map-compiler.cache/"
 screenshot_cachedir="$HOME/xonotic-map-screenshot.cache/"
-build_override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
+build_override="-bsp_timeout 1800 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
 screenshot_override="9 600 +g_ctf 1"
 
 getthemap_fail=false
@@ -230,7 +230,7 @@ screenshotthemap()
                else
                        #startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- :8
                        #startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -gl_driver /usr/local/lib/gallium3d/libGL.so -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
-                       startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" +vid_soft 1 -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
+                       startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
                fi
        )
        if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
@@ -357,7 +357,10 @@ case "$1" in
                runmakeindex
                ;;
        download)
-               cd data/xonotic-maps.pk3dir
+               if ! cd data/xonotic-maps.pk3dir; then
+                       echo "data/xonotic-maps.pk3dir does not exist, not downloading"
+                       exit 0
+               fi
                rundownload
                cd ../..
                echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"