fix :)

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler-autobuild

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 3289aef93ebbd6bff80f5a77c6de9dcc6047ec42..19703c4769583dbe0427f652748280ab4e6aaea0 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -3,12 +3,12 @@
 set -e
 
 bspdir="$PWD/data"
-http_url=http://beta.xonotic.org/autobuild-bsp/
+url_http=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/"
 build_override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
-screenshot_override="9 300"
+screenshot_override="9 300 +g_ctf 1"
 
 getthemap_fail=false
 
@@ -205,6 +205,7 @@ screenshotthemap()
        if [ -n "$IRCSPAM" ]; then
                ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 0 > "maps/$M.ircss"
        fi
+       chmod 1777 "$M-$blobhash"
        ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
        rsync -vaSHP "$M-$blobhash" "$url_ssh"
        rsync -vaSHP "$M" "$url_ssh""latest/"
@@ -243,13 +244,18 @@ case "$1" in
        build)
                cd data/xonotic-maps.pk3dir
                git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
+                       case "$REFNAME" in
+                               */archived/*)
+                                       continue
+                                       ;;
+                       esac
                        if [ -f "$build_cachedir/$HASH" ]; then
                                continue
                        fi
                        git reset --hard
                        git clean -xfd
                        git checkout -f "$HASH"
-                       allmaps buildthemap "$REFNAME" "$HASH" "$http_url"
+                       allmaps buildthemap "$REFNAME" "$HASH" "$url_http"
                        touch "$build_cachedir/$HASH"
                done
                git checkout -f master
@@ -257,6 +263,11 @@ case "$1" in
        screenshot)
                cd data/xonotic-maps.pk3dir
                git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
+                       case "$REFNAME" in
+                               */archived/*)
+                                       continue
+                                       ;;
+                       esac
                        if [ -f "$screenshot_cachedir/$HASH" ]; then
                                continue
                        fi
@@ -272,10 +283,10 @@ case "$1" in
                                fi
                        done
                        cd data/xonotic-maps.pk3dir
-                       allmaps getthemap "$http_url" "$bspdir.old" "$bspdir"
+                       allmaps getthemap "$url_http" "$bspdir.old" "$bspdir"
 
                        if ! $getthemap_fail; then
-                               allmaps screenshotthemap "$REFNAME" "$HASH" "$http_url"
+                               allmaps screenshotthemap "$REFNAME" "$HASH" "$url_http"
                                touch "$screenshot_cachedir/$HASH"
                        fi
                done
@@ -289,7 +300,7 @@ case "$1" in
                        fi
                done
                cd data/xonotic-maps.pk3dir
-               allmaps getthemap "$http_url" "$bspdir.old" "$bspdir"
+               allmaps getthemap "$url_http" "$bspdir.old" "$bspdir"
                echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"
                ls -l "$bspdir.old"
                ;;
@@ -297,7 +308,7 @@ case "$1" in
                mkdir -p "$bspdir"
                cd "$bspdir"
                rm -f *-????????????????????????????????????????-????????????????????????????????????????.pk3
-               wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$http_url""latest"
+               wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url_http""latest"
                ;;
        log2spam-test)
                log2spam "mapname" "http://mapurl" "branch" "commit" "0"