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 600 +g_ctf 1"
getthemap_fail=false
t0=`date +%s`
(
cd maps
- ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $build_override > "$M.log"
+ sz=`grep '^size\>' "$M.mapinfo" 2>/dev/null || true`
+ if [ -n "$sz" ]; then
+ minimap_override="-minimap + -minmax ${sz#size}"
+ else
+ minimap_override=
+ fi
+ ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $build_override $minimap_override > "$M.log"
)
t1=`date +%s`
dt=$(($t1 - $t0))
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"
+ 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" > "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!
rsync -vaSHP "$M-$blobhash" "$url_ssh"
rsync -vaSHP "$M" "$url_ssh""latest/"
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
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
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"
;;
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"