From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 14 Sep 2010 04:00:59 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~225
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=0a49b6cf7fc5732685cfbc8c055056896ac38396;hp=4bfcaf17a9a6370f0c939810d83c4ea99189cde4

Merge branch 'master' of ssh://git.xonotic.org/xonotic
---

diff --git a/all b/all
index 9d366580..83ef8bda 100755
--- a/all
+++ b/all
@@ -1177,16 +1177,29 @@ case "$cmd" in
 			major=$(($gv / 10000))
 			minor=$(($gv / 100 - $major * 100))
 			patch=$(($gv - $major * 10000 - $minor * 100))
+			versionstr="$major.$minor.$patch"
+			case "$RELEASETYPE" in
+				beta)
+					versionstr="$versionstr""beta"
+					;;
+			esac
 			verbose sed -i "
-				s/^set g_xonoticversion [^ ]* /set g_xonoticversion $major.$minor.$patch /;
+				s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
 				s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
 				s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
 			" defaultXonotic.cfg
+			(
+				verbose cd gfx/menu/luminos
+				verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .
+				verbose "$d0"/mediasource/gfx/menu/luminos_versionbuilder/versionbuilder "$versionstr"
+				verbose rm background_l2.svg
+			)
 		fi
 		if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
 			for X in ../../data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
 				if [ -f "$X" ]; then
 					verbose unzip "$X"
+					verbose rm -f maps/*.log maps/*.irc maps/*.lin
 				fi
 			done
 		fi