X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=0b5cd720e4671f04d8937b933df95d802f01bf1c;hb=e3f69c1240066b38f96cf54e8c8a3a90f6710202;hp=564b1221620d5a8ad5d4c9e72aeca7d044b5936a;hpb=e654d98b21fff82ee94301f91d9a787e9d1e9bd4;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 564b1221..0b5cd720 100755
--- 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
@@ -229,7 +229,7 @@ screenshotthemap()
 			misc/tools/xonotic-map-screenshot "$M" $screenshot_override +"scr_screenshot_name \"$M-\""
 		else
 			#startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- :8
-			LD_LIBRARY_PATH=/usr/local/lib/gallium3d \
+			#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-\"" -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
 		fi
 	)
@@ -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:"