X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=41ef0c30dc63c562eced6b02401f978ba80f9023;hb=f8f9e28a99ecf788f8fff183f142b4482e26a0ae;hp=2f93abd9e4b720177c3e590a5b5f422a53c93ef4;hpb=af927722ffe4d02726277eab05b45e2cbccc4909;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 2f93abd9..41ef0c30 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -4,7 +4,7 @@ set -e
 
 bspdir="$PWD/data"
 url_http=https://beta.xonotic.org/autobuild-bsp/
-url_ssh=xonotic-beta:.
+url_ssh=xonotic-beta:./
 build_cachedir="$HOME/xonotic-map-compiler.cache/"
 screenshot_cachedir="$HOME/xonotic-map-screenshot.cache/"
 build_override="-bsp_timeout 3600 -vis_timeout 10800 -light_timeout 18000 -minimap_timeout 900 -scale_timeout 900 -timeout_stealing 0.8"
@@ -272,10 +272,10 @@ screenshotthemap()
 	) 2>&1 | tee ~/.xonotic/data/autoscreenshot.log
 	good=false
 	if mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
-		ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > ~/.xonotic/data/"$M.ircss"
+		ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 0 > ~/.xonotic/data/"$M.ircss"
 	else
 		mkdir "$M-$blobhash"
-		ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > ~/.xonotic/data/"$M.ircss"
+		ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 1 > ~/.xonotic/data/"$M.ircss"
 	fi
 	mv ~/.xonotic/data/"$M.ircss" "$M-$blobhash"/
 	mv ~/.xonotic/data/autoscreenshot.log "$M-$blobhash"/
@@ -311,12 +311,14 @@ getthemap()
 		if ! curl -Lo "$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
 	if ! unzip -l "$bspdir/$M-$blobhash.pk3"; then
 		rm -f "$bspdir/$M-$blobhash.pk3"
 		echo "WARNING: could not download $url$M-$blobhash.pk3, invalid zip file"
+		getthemap_fail=true
 		return 0
 	fi
 }