X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=3289aef93ebbd6bff80f5a77c6de9dcc6047ec42;hp=9a5be4eb803285007f6cfee5ec9f533977c04a05;hb=5509af04c0382afd07e18e605e5272146463ec3d;hpb=44c9fdb6f30393fb34a75b014076071d0b04b5c6

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 9a5be4eb..3289aef9 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -3,7 +3,7 @@
 set -e
 
 bspdir="$PWD/data"
-url=http://beta.xonotic.org/autobuild-bsp/
+http_url=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/"
@@ -190,7 +190,11 @@ screenshotthemap()
 	rm -rf ~/.xonotic
 	(
 		cd ../..
-		misc/tools/xonotic-map-screenshot "$M" $screenshot_override +"scr_screenshot_name \"$M-\""
+		if [ -n "$DISPLAY" ]; then
+			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
+		fi
 	)
 	if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
 		if [ -n "$IRCSPAM" ]; then
@@ -245,7 +249,7 @@ case "$1" in
 			git reset --hard
 			git clean -xfd
 			git checkout -f "$HASH"
-			allmaps buildthemap "$REFNAME" "$HASH" "$url"
+			allmaps buildthemap "$REFNAME" "$HASH" "$http_url"
 			touch "$build_cachedir/$HASH"
 		done
 		git checkout -f master
@@ -259,9 +263,19 @@ case "$1" in
 			git reset --hard
 			git clean -xfd
 			git checkout -f "$HASH"
-			allmaps getthemap "$url" "$bspdir.old" "$bspdir"
+
+			cd ../..
+			mkdir -p "$bspdir" "$bspdir.old"
+			for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+				if [ -e "$b" ]; then
+					mv "$b" "$bspdir.old"/
+				fi
+			done
+			cd data/xonotic-maps.pk3dir
+			allmaps getthemap "$http_url" "$bspdir.old" "$bspdir"
+
 			if ! $getthemap_fail; then
-				allmaps screenshotthemap "$REFNAME" "$HASH" "$url"
+				allmaps screenshotthemap "$REFNAME" "$HASH" "$http_url"
 				touch "$screenshot_cachedir/$HASH"
 			fi
 		done
@@ -275,7 +289,7 @@ case "$1" in
 			fi
 		done
 		cd data/xonotic-maps.pk3dir
-		allmaps getthemap "$url" "$bspdir.old" "$bspdir"
+		allmaps getthemap "$http_url" "$bspdir.old" "$bspdir"
 		echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"
 		ls -l "$bspdir.old"
 		;;
@@ -283,7 +297,7 @@ case "$1" in
 		mkdir -p "$bspdir"
 		cd "$bspdir"
 		rm -f *-????????????????????????????????????????-????????????????????????????????????????.pk3
-		wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url""latest"
+		wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$http_url""latest"
 		;;
 	log2spam-test)
 		log2spam "mapname" "http://mapurl" "branch" "commit" "0"