set access permissions for map screenshots dir for my web script to work

[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 bb4ddb403baf26fb452cfe2ab553bcfd422c32fb..194905d94270839927fc863a8ec7709c29e1d9da 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"
-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
 
@@ -190,18 +190,23 @@ 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
-                       ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" > "maps/$M.ircss"
+                       ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 1 > "maps/$M.ircss"
                fi
                return 1
        fi
        if [ -n "$IRCSPAM" ]; then
-               ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" > "maps/$M.ircss"
+               ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 0 > "maps/$M.ircss"
        fi
        ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
+       chmod -R 1777 "$M"
        rsync -vaSHP "$M-$blobhash" "$url_ssh"
        rsync -vaSHP "$M" "$url_ssh""latest/"
        if [ -n "$IRCSPAM" ]; then
@@ -239,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" "$url"
+                       allmaps buildthemap "$REFNAME" "$HASH" "$url_http"
                        touch "$build_cachedir/$HASH"
                done
                git checkout -f master
@@ -253,15 +263,30 @@ 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
                        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 "$url_http" "$bspdir.old" "$bspdir"
+
                        if ! $getthemap_fail; then
-                               allmaps screenshotthemap "$REFNAME" "$HASH" "$url"
+                               allmaps screenshotthemap "$REFNAME" "$HASH" "$url_http"
                                touch "$screenshot_cachedir/$HASH"
                        fi
                done
@@ -275,7 +300,7 @@ case "$1" in
                        fi
                done
                cd data/xonotic-maps.pk3dir
-               allmaps getthemap "$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"
                ;;
@@ -283,7 +308,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_http""latest"
                ;;
        log2spam-test)
                log2spam "mapname" "http://mapurl" "branch" "commit" "0"