r7632 - packages/trunk/worldofpadman/debian/scripts

[Jack Coulter]

Author: jscinoz-guest
Date: 2008-07-01 04:39:51 +0000 (Tue, 01 Jul 2008)
New Revision: 7632

Modified:
   packages/trunk/worldofpadman/debian/scripts/worldofpadman
   packages/trunk/worldofpadman/debian/scripts/worldofpadman-server
Log:
upstream didn't set sv_master1 in default.cfg of their main pk3, so it has to be done in script

Modified: packages/trunk/worldofpadman/debian/scripts/worldofpadman
===================================================================
--- packages/trunk/worldofpadman/debian/scripts/worldofpadman	2008-07-01 04:39:26 UTC (rev 7631)
+++ packages/trunk/worldofpadman/debian/scripts/worldofpadman	2008-07-01 04:39:51 UTC (rev 7632)
@@ -3,6 +3,9 @@
 BINARY=/usr/lib/games/ioquake3/ioquake3
 BASE_PATH=/usr/share/games/worldofpadman
 GAME=wop
+MASTER=wopmaster.kickchat.com # Upstream should have this set in default.cfg
+CVARS="+set com_standalone 1 +set fs_basepath ${BASE_PATH} +set fs_game ${GAME}\
+ +set fs_homepath $HOME/.WoPadman +set sv_master1 ${MASTER}"
 QUIET=0
 EXCUSE="\
 World of Padman client wrapper\n\
@@ -35,9 +38,9 @@
 # Ready to rumble!
 
 if [ ${QUIET} -eq 1 ]; then
-	exec ${BINARY} +set com_standalone 1 +set fs_basepath ${BASE_PATH} +set fs_game ${GAME} +set ttycon 0 $* >/dev/null 2>&1
+	exec ${BINARY} ${CVARS} +set ttycon 0 $* >/dev/null 2>&1
 else
-	exec ${BINARY} +set com_standalone 1 +set fs_basepath ${BASE_PATH} +set fs_game ${GAME} $*
+	exec ${BINARY} ${CVARS} $*
 fi
 
 exit $?

Modified: packages/trunk/worldofpadman/debian/scripts/worldofpadman-server
===================================================================
--- packages/trunk/worldofpadman/debian/scripts/worldofpadman-server	2008-07-01 04:39:26 UTC (rev 7631)
+++ packages/trunk/worldofpadman/debian/scripts/worldofpadman-server	2008-07-01 04:39:51 UTC (rev 7632)
@@ -3,6 +3,9 @@
 BINARY=/usr/lib/games/ioquake3/ioq3ded
 BASE_PATH=/usr/share/games/worldofpadman
 GAME=wop
+MASTER=wopmaster.kickchat.com # Upstream should have this set in default.cfg
+CVARS="+set com_standalone 1 +set fs_basepath ${BASE_PATH} +set fs_game ${GAME}\
+ +set fs_homepath $HOME/.WoPadman +set sv_master1 ${MASTER}"
 QUIET=0
 EXCUSE="\
 World of Padman server wrapper\n\
@@ -35,9 +38,9 @@
 # Ready to rumble!
 
 if [ ${QUIET} -eq 1 ]; then
-	exec ${BINARY} +set com_standalone 1 +set fs_basepath ${BASE_PATH} +set fs_game ${GAME} +set ttycon 0 $* >/dev/null 2>&1
+	exec ${BINARY} ${CVARS} +set ttycon 0 $* >/dev/null 2>&1
 else
-	exec ${BINARY} +set com_standalone 1 +set fs_basepath ${BASE_PATH} +set fs_game ${GAME} $*
+	exec ${BINARY} ${CVARS} $*
 fi
 
 exit $?