r5657 - trunk/misc/tools

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-24 14:48:11 -0500 (Sat, 24 Jan 2009)
New Revision: 5657

Modified:
   trunk/misc/tools/makebuild.sh
Log:
makebuild: remove the showbrand block if desired


Modified: trunk/misc/tools/makebuild.sh
===================================================================
--- trunk/misc/tools/makebuild.sh	2009-01-24 19:29:12 UTC (rev 5656)
+++ trunk/misc/tools/makebuild.sh	2009-01-24 19:48:11 UTC (rev 5657)
@@ -236,21 +236,15 @@
 rm FAQ.aft-TOC
 cd "$tmpdir/data"
 mv common-spog.pk3 ..
-perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version'\n"' default.cfg
-if [ -n "$versiontag" ]; then
-	perl -pi -e '/^set g_nexuizversion/ and $_ = "showbrand 3\n$_"' default.cfg
-	cp "$buildfiles/brand/$versiontag.tga" gfx/brand.tga
+perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version'\n"' defaultNexuiz.cfg
+if [ -z "$versiontag" ]; then
+	perl -pi -e 'm|^//!<showbrand| .. m|^//!>showbrand| and $_ = "";' defaultNexuiz.cfg
+	rm -f gfx/brand.tga
 fi
-echo >> default.cfg
-echo "$defaultcfg" >> default.cfg
+echo >> defaultNexuiz.cfg
+echo "$defaultcfg" >> defaultNexuiz.cfg
 mk7z ../data.pk3 .
 cd "$tmpdir/havoc"
-perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version-havoc'\n"' default.cfg
-if [ -n "$versiontag" ]; then
-	perl -pi -e '/^set g_nexuizversion/ and $_ = "showbrand 3\n$_"' default.cfg
-fi
-echo >> default.cfg
-echo "$defaultcfg" >> default.cfg
 mk7z ../havoc.pk3 .
 
 # make data pk3