From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 20 Feb 2012 12:08:23 +0000 (+0100)
Subject: autoscreenshot: do not try again after a failure
X-Git-Tag: xonotic-v0.6.0~27
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5d969f2992f95cd6e062c2d514eb533f6176559e;p=xonotic%2Fxonotic.git

autoscreenshot: do not try again after a failure
---

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 2ee3af1f..bf4c9c0b 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -238,19 +238,16 @@ screenshotthemap()
 					;;
 			esac
 		fi
-	) >~/.xonotic/autoscreenshot.log 2>&1
-	if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
-		if [ -n "$IRCSPAM" ]; then
-			#ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
-			ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
-		fi
-		return 1
-	fi
-	mv ~/.xonotic/autoscreenshot.log "$M-$blobhash"/ || true
-	if [ -n "$IRCSPAM" ]; then
-		#ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+	) 2>&1 | tee ~/.xonotic/autoscreenshot.log
+	good=false
+	if mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
 		ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+	else
+		mkdir "$M-$blobhash"
+		ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
 	fi
+	mv "maps/$M.ircss" "$M-$blobhash"/
+	mv ~/.xonotic/autoscreenshot.log "$M-$blobhash"/ || mkdir -p "$M-$blobhash"
 	chmod 1777 "$M-$blobhash"
 	ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
 	rsync -vaSHP "$M-$blobhash" "$url_ssh"
@@ -258,6 +255,7 @@ screenshotthemap()
 	if [ -n "$IRCSPAM" ]; then
 		$IRCSPAM < "maps/$M.ircss"
 	fi
+	return 1
 }
 
 getthemap()