X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;h=401b9bbb17c66161c21e53a2c00007cee3c9d54e;hp=40cd4b8df301ef910a762658e67558646f5c33de;hb=ae42651d6185955b0352c883adae13cbe39720bd;hpb=b9b2f96253d09fb864c2d66dbf917a39e2c65014

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 40cd4b8d..401b9bbb 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -208,51 +208,68 @@ case "$cmd" in
 		binary=$1
 		basename=${binary##*/}
 		rev=`( cd "$d0/darkplaces" && git rev-parse HEAD )`
-		verbose wget "http://beta.xonotic.org/autobuild-bin/$rev/$basename"
+		verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$basename"
+		[ -s "$binary" ] || rm -f "$binary"
+		[ -f "$binary" ]
 		# TODO eventually do the rebranding on travis too.
 		case "$binary" in
 			Xonotic/xonotic*.exe)
 				verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$binary"
 				;;
+			Xonotic/*osx*|Xonotic/*linux*)
+				chmod +x "$binary"
+				;;
 		esac
 		;;
 	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-sdl.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-sdl.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-glx || good=false
+		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-sdl || 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-glx || good=false
+		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || 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
@@ -472,9 +489,10 @@ case "$cmd" in
 		;;
 	release-pack)
 		release_common
+		verbose "$SELF" release-buildpk3s data/font-unifont.pk3dir      raw ''
 		verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir     raw ''
-		verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir             low '-low' normaldds ''                    webp '-high'
-		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             low '-low' normaldds '' mapping '-mapping' webp '-high'
+		verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir             low '-low' normaldds ''                    normal '-high'
+		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             low '-low' normaldds '' mapping '-mapping' normal '-high'
 		verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir     raw '' low '-low'
 		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                   normaldds ''
 		;;
@@ -519,6 +537,7 @@ case "$cmd" in
 				Xonotic/gmqcc \
 				Xonotic/server \
 				Xonotic/key_0.d0pk \
+				Xonotic/data/font-unifont-$pk3stamp.pk3 \
 				Xonotic/data/font-xolonium-$pk3stamp.pk3
 			verbose cp Xonotic-$stamp-enginesource$suffix.zip Xonotic-$stamp-source$suffix.zip
 			verbose mkzip Xonotic-$stamp-source$suffix.zip \