X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=7179a3bf71c8f1e2c28184900682d47585891835;hp=1d6cde8db3e43cdf0ebceae34c96224c5956a35d;hb=d8d1cd7183a8cd18961fd4f36b38429e0a31327d;hpb=8d86e11354671e3e1f5a628998f23193f82ee802

diff --git a/all b/all
index 1d6cde8d..7179a3bf 100755
--- a/all
+++ b/all
@@ -956,7 +956,7 @@ case "$cmd" in
 		;;
 	release-engine)
 		"$SELF" release-engine-win32 &
-		"$SELF" release-engine-win64 &
+		# "$SELF" release-engine-win64 &
 		"$SELF" release-engine-osx &
 		"$SELF" release-engine-linux32 &
 		"$SELF" release-engine-linux64 &
@@ -964,13 +964,6 @@ case "$cmd" in
 		;;
 	release-maps)
 		"$SELF" update-maps
-		for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
-			if [ -f "$X" ]; then
-				cd Xonotic/data/xonotic-maps.pk3dir
-				unzip ../../../"$X"
-				cd ../../..
-			fi
-		done
 		;;
 	release-finish)
 		# version numnber and stuff like that
@@ -1031,6 +1024,16 @@ case "$cmd" in
 			cp "$src"/csprogs.dat Xonotic/temp/
 			cp "$src"/menu.dat Xonotic/temp/
 		fi
+		if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
+			for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+				if [ -f "$X" ]; then
+					(
+						cd Xonotic/data/xonotic-maps.pk3dir
+						unzip ../../../"$X"
+					)
+				fi
+			done
+		fi
 		"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
 		cd Xonotic/temp
 		zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
@@ -1047,7 +1050,7 @@ case "$cmd" in
 		done
 		;;
 	release-pack)
-		"$SELF" release-buildpk3s data/font-dejavu.pk3dir                  raw ''
+		"$SELF" release-buildpk3s data/font-nimbussansl.pk3dir             raw ''
 		"$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low'
 		"$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low'
 		"$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
@@ -1055,10 +1058,11 @@ case "$cmd" in
 		;;
 	release)
 		"$SELF" release-prepare
-		"$SELF" release-engine
-		"$SELF" release-maps
-		"$SELF" release-finish
-		"$SELF" release-qc
+		"$SELF" release-maps &
+		"$SELF" release-engine &
+		"$SELF" release-finish &
+		"$SELF" release-qc &
+		wait
 		"$SELF" release-pack
 		;;