X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;h=7cc8c639063b2a441dd2eefd077bf15049a6f669;hp=401b9bbb17c66161c21e53a2c00007cee3c9d54e;hb=2627fa199fee9062e810d1bde97d5a9ce0ffe5c8;hpb=ae42651d6185955b0352c883adae13cbe39720bd

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 401b9bbb..7cc8c639 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -207,15 +207,12 @@ 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)
-				verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$binary"
-				;;
 			Xonotic/*osx*|Xonotic/*linux*)
 				chmod +x "$binary"
 				;;
@@ -224,17 +221,17 @@ case "$cmd" in
 	release-engine-win32)
 		release_common
 		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
+		verbose "$SELF" release-getbinary Xonotic/xonotic-x86.exe || good=false
+		verbose "$SELF" release-getbinary Xonotic/xonotic-x86-wgl.exe || good=false
+		verbose "$SELF" release-getbinary Xonotic/xonotic-x86-dedicated.exe || good=false
 		$good
 		;;
 	release-engine-win64)
 		release_common
 		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
+		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-osx)
@@ -247,16 +244,16 @@ case "$cmd" in
 	release-engine-linux32)
 		release_common
 		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-glx || good=false
 		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-dedicated || good=false
 		$good
 		;;
 	release-engine-linux64)
 		release_common
 		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-glx || good=false
 		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
 		$good
 		;;