X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=62cb7187bec26f0121c8907f48410d48977e9c3a;hp=dcce6abc577abc4bf2381b103f96f43753b284c1;hb=036e5f4205ded6599ab2fd1f12b57c93a5f998ad;hpb=c6ea9d406d8541b88593ed69b46749d8ce350731

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index dcce6abc..62cb7187 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -3,11 +3,11 @@
 set -e
 
 bspdir="$PWD/data"
-url=http://141.2.16.23/~xonotic/bsp-autobuilds/
+url=http://beta.xonotic.org/autobuild-bsp/
+url_ssh=beta.xonotic.org:autobuild-bsp/
+cachedir="$HOME/xonotic-map-compiler.cache/"
 override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
 
-bspoutdir="$HOME/public_html/bsp-autobuilds/"
-
 allmaps()
 {
 	for F in maps/*.map.options; do
@@ -136,8 +136,11 @@ buildthemap()
 	if [ -n "$IRCSPAM" ]; then
 		cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" "$status" "$dt" > "maps/$M.irc"
 	fi
-	zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M.irc" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
-	ln -snf "../$M-$blobhash.pk3" "$bspdir/latest/$M.pk3" # from ALL branches, so beware!
+	zip -9r "$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M.irc" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
+	ln -snf "../$M-$blobhash.pk3" "$M.pk3" # from ALL branches, so beware!
+	rsync -vaSHP "$M-$blobhash.pk3" "$url_ssh"
+	rsync -vaSHP "$M.pk3" "$url_ssh""latest/"
+	rm -f *.pk3
 	if [ -n "$IRCSPAM" ]; then
 		$IRCSPAM < "maps/$M.irc"
 	fi
@@ -154,9 +157,11 @@ getthemap()
 		continue
 	fi
 	if ! wget -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"
-		return 0
+		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"
+			return 0
+		fi
 	fi
 	if ! unzip -l "$bspdir/$M-$blobhash.pk3"; then
 		rm -f "$bspdir/$M-$blobhash.pk3"
@@ -167,20 +172,26 @@ getthemap()
 
 case "$1" in
 	build)
-		mkdir -p "$bspoutdir"
-		mkdir -p "$bspoutdir/latest"
 		cd data/xonotic-maps.pk3dir
 		git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
+			if [ -f "$cachedir/$HASH" ]; then
+				continue
+			fi
 			git reset --hard
 			git clean -xfd
-			git checkout "$HASH"
+			git checkout -f "$HASH"
 			allmaps buildthemap "$REFNAME" "$HASH" "$url" "$bspoutdir"
+			touch "$cachedir/$HASH"
 		done
-		git checkout master
+		git checkout -f master
 		;;
 	download)
 		mkdir -p "$bspdir" "$bspdir.old"
-		mv "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3 "$bspdir.old"/ || true
+		for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+			if [ -e "$b" ]; then
+				mv "$b" "$bspdir.old"/
+			fi
+		done
 		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:"