X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=5c6db64de23a62450129bfe934511064b0d6b204;hp=194905d94270839927fc863a8ec7709c29e1d9da;hb=9495ed15585fb877f984344ce301cea471e6b8b9;hpb=58131501bb919b974c3a90b6776eeb868546a9e8 diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild index 194905d9..5c6db64d 100755 --- a/misc/tools/xonotic-map-compiler-autobuild +++ b/misc/tools/xonotic-map-compiler-autobuild @@ -8,7 +8,7 @@ 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 +g_ctf 1" +screenshot_override="9 600 +g_ctf 1" getthemap_fail=false @@ -198,15 +198,17 @@ screenshotthemap() ) if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then if [ -n "$IRCSPAM" ]; then - ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 1 > "maps/$M.ircss" + #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 1 > "maps/$M.ircss" + ss2spam "$M" "$url?d" "$REFNAME" "$HASH" 1 > "maps/$M.ircss" fi return 1 fi if [ -n "$IRCSPAM" ]; then - ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 0 > "maps/$M.ircss" + #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 0 > "maps/$M.ircss" + ss2spam "$M" "$url?d" "$REFNAME" "$HASH" 0 > "maps/$M.ircss" fi + chmod 1777 "$M-$blobhash" 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