[game-data-packager] 20/293: Fixed loop in the server wrapper script, when called with +exec parameter

[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 392b2f3b33925f6bf9298a1fdafc2e56c4598680
Author: Bruno "Fuddl" Kleinert <fuddl at debian.org>
Date:   Sat Mar 11 20:04:38 2006 +0000

    Fixed loop in the server wrapper script, when called with +exec parameter
---
 debian/scripts/ioq3ded  | 22 +++++++++-------------
 debian/scripts/ioquake3 |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/debian/scripts/ioq3ded b/debian/scripts/ioq3ded
index 5db073f..682a358 100644
--- a/debian/scripts/ioq3ded
+++ b/debian/scripts/ioq3ded
@@ -6,25 +6,21 @@ This script is Debian specific, it is *NOT* part of the source distribution!\n\
 Usage: ioquake3-server [OPTION]...\n\
 \n\
  -h, --help\t\tDisplay this help\n\
- +set option value\tPass options to the Icculus.Org Quake III Arena server binary\n"
+ +set option value\tPass options to the ioQuake III Arena server binary\n\
+ +exec foobar.cfg\tExecute a ioQuake III script.\n"
 
 MISSING_FILES="\
 Required Quake III data files are not installed.\n\
-As root, run 'dpkg-reconfigure ioquake3-data'.\n"
+As root, run 'dpkg-reconfigure quake3-data'.\n"
 
 # Quake 3 binaries don't understand "regular" command line parameters. Let's
 # catch them here, to avoid accidently launching the binary.
-while [ "$1" != "" ]; do {
-	if [ "$1" == "+set" ]; then
-		break;
-	fi
-	case "$1" in
-		-h|--help)
-			echo -e ${EXCUSE}
-			exit 0;
-			;;
-	esac
-}; done
+case "$1" in
+	-h|--help)
+		echo -e ${EXCUSE}
+		exit 0;
+		;;
+esac
 
 # Is ioquake3-data configured?
 for i in `seq -w 0 1 8`; do
diff --git a/debian/scripts/ioquake3 b/debian/scripts/ioquake3
index bbe984a..6409572 100644
--- a/debian/scripts/ioquake3
+++ b/debian/scripts/ioquake3
@@ -22,7 +22,7 @@ BINARY=ioquake3
 # catch them here, to avoid accidently launching the binary.
 
 while [ "$1" != "" ]; do {
-	if [ "$1" == "+set" ]; then
+	if [ "$1" == "+set" ] || [ "$1" == "+exec" ]; then
 		break;
 	fi
 	case "$1" in

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