X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=fdde421de67d518704bc81605dc1811b0c041d78;hp=af49c9bf2b0f92fd3681e50a258d95f34ab7e5cc;hb=d874cfb9ed52bfdf43c8e533c7208295d597ac2b;hpb=7f1d2f3fb6e08067edb2dc0350fc6bb58be879f6 diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild index af49c9bf..fdde421d 100755 --- a/misc/tools/xonotic-map-compiler-autobuild +++ b/misc/tools/xonotic-map-compiler-autobuild @@ -3,7 +3,7 @@ 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/" @@ -254,7 +254,7 @@ case "$1" in 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 @@ -282,10 +282,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 @@ -299,7 +299,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" ;; @@ -307,7 +307,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"