X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=0fdcc501dfa9a39bbfe8b9746045679adf3fa952;hp=1194ee093db895bbb9f6205d790a2b1c030456c6;hb=97fe16d7d3bf7c97873cc5ef52730fee817a6f72;hpb=338d89ad41e81f14b2620e028530c1f23a13c523

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 1194ee09..0fdcc501 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -116,6 +116,11 @@ log2spam()
 			WARNING:\ Couldn\'t\ find\ image\ for\ shader\ *)
 				s_failshaders="$s_failshaders ${L##* }"
 				;;
+			ERROR:\ *)
+				if [ -z "$s_error" ]; then
+					s_error=$L
+				fi
+				;;
 			'******* leaked *******')
 				s_leaked=1
 				;;
@@ -172,17 +177,20 @@ buildthemap()
 	t0=`date +%s`
 	(
 		cd maps
-		sz=`grep '^size\>' "$M.mapinfo" 2>/dev/null || true`
+		sz=`grep '^size ' "$M.mapinfo" 2>/dev/null || true`
 		if [ -n "$sz" ]; then
-			minimap_override="-minimap + -minmax ${sz#size}"
+			minimap_override="-minimap + -minmax ${sz#size }"
 		else
 			minimap_override=
 		fi
-		../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $build_override $minimap_override > "$M.log"
+		../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override $build_override > "$M.log" 2>&1
 	)
+	status=$?
+	if ! [ -f "maps/$M.bsp" ]; then
+		echo >>"$M.log" "ERROR: No BSP file"
+	fi
 	t1=`date +%s`
 	dt=$(($t1 - $t0))
-	status=$?
 	if [ -n "$IRCSPAM" ]; then
 		cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" "$status" "$dt" > "maps/$M.irc"
 	fi
@@ -209,6 +217,11 @@ screenshotthemap()
 		continue
 	fi
 
+	if ! unzip -l "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp"; then
+		# no BSP file
+		continue
+	fi
+
 	rm -rf ~/.xonotic
 	(
 		cd ../..
@@ -247,9 +260,11 @@ getthemap()
 	blobhash=$5
 	commithash=$6
 	if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then
-		continue
+		if unzip -l "$bspdir/$M-$blobhash.pk3" >/dev/null 2>&1; then
+			return 0
+		fi
 	fi
-	if ! wget -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
+	if ! wget -c -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
 		if ! curl -o "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
 			rm -f "$bspdir/$M-$blobhash.pk3"
 			echo "WARNING: could not download $url$M-$blobhash.pk3, maybe not ready yet"