X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=f33fb9dec344d39c6727db78bd9371d69be0bc02;hb=61260f1659c03bcd7b547b7776f1ec8e5f5c0daf;hp=f2dadd7514b2d16770f28290930b68aeb9aa8106;hpb=aaa88c950c1f6c52edd4eca2aa80632382267417;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index f2dadd75..f33fb9de 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -2,7 +2,7 @@
 
 set -e
 
-bspdir="$PWD/bspfiles"
+bspdir="$PWD/data"
 url=http://141.2.16.23/~xonotic/bsp-autobuilds/
 
 bspoutdir="$HOME/public_html/bsp-autobuilds/"
@@ -65,6 +65,7 @@ log2spam()
 				;;
 		esac
 	done
+	s_failshaders=`echo "$s_failshaders" | sed "s, textures/, ,g"`
 	s_failshaders=${s_failshaders# }
 	if [ -n "$s_error" ]; then
 		echo -n "[$branch] 4failed"
@@ -109,7 +110,7 @@ buildthemap()
 	zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
 	ln -snf "../$M-$blobhash.pk3" "$bspdir/latest/$M.pk3" # from ALL branches, so beware!
 	if [ -n "$IRCSPAM" ]; then
-		cat "$M.log" | log2spam "$M" "$url/$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM
+		cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM
 	fi
 }
 
@@ -149,9 +150,8 @@ case "$1" in
 		git checkout master
 		;;
 	download)
-		rm -rf "$bspdir.old"
-		mv "$bspdir" "$bspdir.old" || true
-		mkdir -p "$bspdir"
+		mkdir -p "$bspdir" "$bspdir.old"
+		mv "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3 "$bspdir.old"/ || true
 		cd data/xonotic-maps.pk3dir
 		allmaps getthemap "$url" "$bspdir.old" "$bspdir"
 		echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"
@@ -161,7 +161,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 "$url""latest"
 		;;
 	log2spam-test)
 		log2spam "mapname" "http://mapurl" "branch" "commit"