[game-data-packager] 85/293: cleanup of scripts

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch quake
in repository game-data-packager.

commit fb401fc7515d6657da5221e1b21d0fc096261703
Author: Jack Coulter <jscinoz at gmail.com>
Date:   Tue Jul 1 04:39:26 2008 +0000

    cleanup of scripts
---
 debian/scripts/quake3        | 5 +++--
 debian/scripts/quake3-server | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/scripts/quake3 b/debian/scripts/quake3
index 71f9503..2543c63 100644
--- a/debian/scripts/quake3
+++ b/debian/scripts/quake3
@@ -2,6 +2,7 @@
 # Adapted from Tremulous and Nexuiz launch scripts
 BINARY=/usr/lib/games/ioquake3/ioquake3
 BASE_PATH=/usr/share/games/quake3
+CVARS="+set fs_basepath ${BASE_PATH}"
 QUIET=0
 EXCUSE="\
 Quake 3 client wrapper\n\
@@ -38,9 +39,9 @@ while [ "$1" != "" ]; do {
 # 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 $?
diff --git a/debian/scripts/quake3-server b/debian/scripts/quake3-server
index 5c5f6c7..af97a1c 100644
--- a/debian/scripts/quake3-server
+++ b/debian/scripts/quake3-server
@@ -2,6 +2,7 @@
 # Adapted from Tremulous and Nexuiz launch scripts
 BINARY=/usr/lib/games/ioquake3/ioq3ded
 BASE_PATH=/usr/share/games/quake3
+CVARS="+set fs_basepath ${BASE_PATH}"
 QUIET=0
 EXCUSE="\
 Quake 3 server wrapper\n\
@@ -38,9 +39,9 @@ while [ "$1" != "" ]; do {
 # 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 $?

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git