X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=d7a3a9364779c028fd16725b22432b99bad94b66;hb=52038b1e1ab050ac469cdb51587790beca63b1dc;hp=4d2798f057eddd5af451ca6c4c5fbd35de043263;hpb=12918d22b9327ca1aabcccbaf32ed93503c031ed;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 4d2798f0..d7a3a936 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -172,18 +172,12 @@ buildthemap()
 	git checkout -f "$commithash"
 
 	if [ -n "$IRCSPAM" ]; then
-		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM
+		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM || true
 	fi
 	t0=`date +%s`
 	(
-		cd maps
-		sz=`grep '^size ' "$M.mapinfo" 2>/dev/null || true`
-		if [ -n "$sz" ]; then
-			minimap_override="-minimap + -minmax ${sz#size }"
-		else
-			minimap_override=
-		fi
-		../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override $build_override > "$M.log" 2>&1
+		cd ../..
+		misc/tools/xonotic-map-compiler-optionsfile "data/xonotic-data.pk3dir/maps/$M" $build_override > "$M.log" 2>&1
 	)
 	status=$?
 	if ! [ -f "maps/$M.bsp" ]; then
@@ -202,7 +196,10 @@ buildthemap()
 	rsync -vaSHP "$M-$blobhash.pk3" "$M-full-$blobhash.pk3" "$url_ssh"
 	rsync -vaSHP "$M.pk3" "$M-full.pk3" "$url_ssh""latest/"
 	if [ -n "$IRCSPAM" ]; then
-		$IRCSPAM < "maps/$M.irc"
+		$IRCSPAM < "maps/$M.irc" || true
+	fi
+	if [ -n "$BUILD_ONE" ]; then
+		exit
 	fi
 }
 
@@ -253,9 +250,11 @@ screenshotthemap()
 	rsync -vaSHP "$M-$blobhash" "$url_ssh"
 	rsync -vaSHP "$M" "$url_ssh""latest/"
 	if [ -n "$IRCSPAM" ]; then
-		$IRCSPAM < "$M-$blobhash/$M.ircss"
+		$IRCSPAM < "$M-$blobhash/$M.ircss" || true
+	fi
+	if [ -n "$BUILD_ONE" ]; then
+		exit
 	fi
-	return 1
 }
 
 getthemap()
@@ -362,6 +361,10 @@ case "$1" in
 		runmakeindex
 		;;
 	download)
+		if ! which unzip >/dev/null 2>&1; then
+			echo "Cannot find unzip, bailing out"
+			exit 1
+		fi
 		if ! cd data/xonotic-maps.pk3dir >/dev/null 2>&1; then
 			echo "data/xonotic-maps.pk3dir does not exist, not downloading"
 			exit 0