X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=bb4ddb403baf26fb452cfe2ab553bcfd422c32fb;hp=7e2af9395b28dc4b73aedbf1320f9012cd0f549c;hb=509d1a597b01b48ce666d8c84d538c4c2e40eedf;hpb=bd3cb8e5e74ac7b578da287971b128899385d0d2

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 7e2af939..bb4ddb40 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -189,7 +189,8 @@ screenshotthemap()
 	fi
 	rm -rf ~/.xonotic
 	(
-		../../misc/tools/xonotic-map-screenshot "$M" $screenshot_override +scr_screenshot_name "$M"
+		cd ../..
+		misc/tools/xonotic-map-screenshot "$M" $screenshot_override +"scr_screenshot_name \"$M-\""
 	)
 	if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
 		if [ -n "$IRCSPAM" ]; then
@@ -200,7 +201,6 @@ screenshotthemap()
 	if [ -n "$IRCSPAM" ]; then
 		ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" > "maps/$M.ircss"
 	fi
-	mv ~/.xonotic/data/screenshots "$M-$blobhash"
 	ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
 	rsync -vaSHP "$M-$blobhash" "$url_ssh"
 	rsync -vaSHP "$M" "$url_ssh""latest/"
@@ -223,6 +223,7 @@ getthemap()
 		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"
+			getthemap_fail=true
 			return 0
 		fi
 	fi