Fix xonotic.exe name

[xonotic/xonotic.git] / misc / tools / all / release.subr

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 60e6940661ef0f7ea91f53c453004d4bf424c357..2b4699038731698ce3bb3a90bc92df5eae977883 100644 (file)
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -207,8 +207,11 @@ case "$cmd" in
                release_common
                binary=$1
                basename=${binary##*/}
+               dpname=darkplaces${basename#xonotic}
                rev=`( cd "$d0/darkplaces" && git rev-parse HEAD )`
-               verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$basename"
+               verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$dpname"
+               [ -s "$binary" ] || rm -f "$binary"
+               [ -f "$binary" ]
                # TODO eventually do the rebranding on travis too.
                case "$binary" in
                        Xonotic/xonotic*.exe)
@@ -221,41 +224,53 @@ case "$cmd" in
                ;;
        release-engine-win32)
                release_common
-               verbose "$SELF" release-getbinary Xonotic/xonotic.exe || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-sdl.exe || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || true
+               good=true
+               verbose "$SELF" release-getbinary Xonotic/xonotic.exe || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-wgl.exe || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false
+               $good
                ;;
        release-engine-win64)
                release_common
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x64.exe || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x64-sdl.exe || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x64-dedicated.exe || true
+               good=true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-x64.exe || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-x64-wgl.exe || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-x64-dedicated.exe || good=false
+               $good
                ;;
        release-engine-osx)
                release_common
-               verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || true
+               good=true
+               verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || good=false
+               $good
                ;;
        release-engine-linux32)
                release_common
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-glx || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-sdl || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-dedicated || true
+               good=true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-sdl || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-glx || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-dedicated || good=false
+               $good
                ;;
        release-engine-linux64)
                release_common
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || true
+               good=true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
+               $good
                ;;
        release-engine)
                release_common
                # TODO report failures here.
-               verbose "$SELF" release-engine-linux32 || true
-               verbose "$SELF" release-engine-linux64 || true
-               verbose "$SELF" release-engine-win32 || true
-               verbose "$SELF" release-engine-win64 || true
-               verbose "$SELF" release-engine-osx || true
+               good=false
+               verbose "$SELF" release-engine-linux32 && good=true
+               verbose "$SELF" release-engine-linux64 && good=true
+               verbose "$SELF" release-engine-win32 && good=true
+               verbose "$SELF" release-engine-win64 && good=true
+               verbose "$SELF" release-engine-osx && good=true
+               $good
                ;;
        release-maps)
                release_common