set -e
bspdir="$PWD/data"
-url=http://beta.xonotic.org/autobuild-bsp/
+http_url=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/"
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
git reset --hard
git clean -xfd
git checkout -f "$HASH"
- allmaps buildthemap "$REFNAME" "$HASH" "$url"
+ allmaps buildthemap "$REFNAME" "$HASH" "$http_url"
touch "$build_cachedir/$HASH"
done
git checkout -f master
git reset --hard
git clean -xfd
git checkout -f "$HASH"
- allmaps getthemap "$url" "$bspdir.old" "$bspdir"
+ allmaps getthemap "$http_url" "$bspdir.old" "$bspdir"
if ! $getthemap_fail; then
- allmaps screenshotthemap "$REFNAME" "$HASH" "$url"
+ allmaps screenshotthemap "$REFNAME" "$HASH" "$http_url"
touch "$screenshot_cachedir/$HASH"
fi
done
fi
done
cd data/xonotic-maps.pk3dir
- allmaps getthemap "$url" "$bspdir.old" "$bspdir"
+ allmaps getthemap "$http_url" "$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 "$http_url""latest"
;;
log2spam-test)
log2spam "mapname" "http://mapurl" "branch" "commit" "0"