X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=29cd9e09115e77c296afae9a172459bceeb946e3;hp=f2dadd7514b2d16770f28290930b68aeb9aa8106;hb=76666d324695939297e0e86a1711abd386d227cc;hpb=aaa88c950c1f6c52edd4eca2aa80632382267417 diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild index f2dadd75..29cd9e09 100755 --- a/misc/tools/xonotic-map-compiler-autobuild +++ b/misc/tools/xonotic-map-compiler-autobuild @@ -65,6 +65,7 @@ log2spam() ;; esac done + s_failshaders=`echo "$s_failshaders" | sed "s, textures/, ,g"` s_failshaders=${s_failshaders# } if [ -n "$s_error" ]; then echo -n "[$branch] 4failed" @@ -109,7 +110,7 @@ buildthemap() zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga" ln -snf "../$M-$blobhash.pk3" "$bspdir/latest/$M.pk3" # from ALL branches, so beware! if [ -n "$IRCSPAM" ]; then - cat "$M.log" | log2spam "$M" "$url/$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM + cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM fi } @@ -161,7 +162,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""latest" ;; log2spam-test) log2spam "mapname" "http://mapurl" "branch" "commit"