r7667 - packages/trunk/worldofpadman/debian/scripts

[Jack Coulter]

Author: jscinoz-guest
Date: 2008-07-02 04:49:46 +0000 (Wed, 02 Jul 2008)
New Revision: 7667

Modified:
   packages/trunk/worldofpadman/debian/scripts/worldofpadman
   packages/trunk/worldofpadman/debian/scripts/worldofpadman-server
Log:
script cleanup

Modified: packages/trunk/worldofpadman/debian/scripts/worldofpadman
===================================================================
--- packages/trunk/worldofpadman/debian/scripts/worldofpadman	2008-07-02 04:49:44 UTC (rev 7666)
+++ packages/trunk/worldofpadman/debian/scripts/worldofpadman	2008-07-02 04:49:46 UTC (rev 7667)
@@ -2,6 +2,7 @@
 # Adapted from Tremulous and Nexuiz launch scripts
 BINARY=/usr/lib/games/worldofpadman/wop-engine
 BASE_PATH=/usr/share/games/worldofpadman
+CVARS="+set fs_basepath ${BASE_PATH}"
 QUIET=0
 EXCUSE="\
 World of Padman client wrapper\n\
@@ -12,8 +13,8 @@
  -q, --quiet\t\tDisable console output\n\
  +<internal command>\tPass commands to the engine\n"
 
-# World of Padman binaries don't understand "regular" command line parameters. Let's
-# catch them here, to avoid accidentally launching the binary.
+# World of Padman binaries don't understand "regular" command line parameters.
+# Let's catch them here, to avoid accidentally launching the binary.
 
 while [ "$1" != "" ]; do {
 	if [ ${1:0:1} = "+" ]; then
@@ -34,9 +35,9 @@
 # Ready to rumble!
 
 if [ ${QUIET} -eq 1 ]; then
-	exec ${BINARY} +set fs_basepath ${BASE_PATH} +set ttycon 0 $* >/dev/null 2>&1
+	exec ${BINARY} ${CVARS} +set ttycon 0 $* >/dev/null 2>&1
 else
-	exec ${BINARY} +set fs_basepath ${BASE_PATH} $*
+	exec ${BINARY} ${CVARS} $*
 fi
 
 exit $?

Modified: packages/trunk/worldofpadman/debian/scripts/worldofpadman-server
===================================================================
--- packages/trunk/worldofpadman/debian/scripts/worldofpadman-server	2008-07-02 04:49:44 UTC (rev 7666)
+++ packages/trunk/worldofpadman/debian/scripts/worldofpadman-server	2008-07-02 04:49:46 UTC (rev 7667)
@@ -2,6 +2,7 @@
 # Adapted from Tremulous and Nexuiz launch scripts
 BINARY=/usr/lib/games/worldofpadman/wopded
 BASE_PATH=/usr/share/games/worldofpadman
+CVARS="+set fs_basepath ${BASE_PATH}"
 QUIET=0
 EXCUSE="\
 World of Padman server wrapper\n\
@@ -12,8 +13,8 @@
  -q, --quiet\t\tDisable console output\n\
  +<internal command>\tPass commands to the engine\n"
 
-# World of Padman binaries don't understand "regular" command line parameters. Let's
-# catch them here, to avoid accidentally launching the binary.
+# World of Padman binaries don't understand "regular" command line parameters.
+# Let's catch them here, to avoid accidentally launching the binary.
 
 while [ "$1" != "" ]; do {
 	if [ ${1:0:1} = "+" ]; then
@@ -34,9 +35,9 @@
 # Ready to rumble!
 
 if [ ${QUIET} -eq 1 ]; then
-	exec ${BINARY} +set fs_basepath ${BASE_PATH} +set ttycon 0 $* >/dev/null 2>&1
+	exec ${BINARY} ${CVARS} +set ttycon 0 $* >/dev/null 2>&1
 else
-	exec ${BINARY} +set fs_basepath ${BASE_PATH} $*
+	exec ${BINARY} ${CVARS} $*
 fi
 
 exit $?