[SCM] team based FPS game - packaging branch, debian, updated. debian/1.1.0-4.1-11-g4d49579
Simon McVittie
smcv at debian.org
Sat Jul 17 03:31:42 UTC 2010
The following commit has been merged in the debian branch:
commit 6d9390cbbd0b9978227ba4fcf04c265b4e4172a4
Author: Simon McVittie <smcv at debian.org>
Date: Thu Jul 15 23:41:00 2010 +0100
Fix various bugs in the launcher scripts
* Fix tremulous --help and tremulous-server --help (Closes: #566530)
* Remove bashisms from those script wrappers (Closes: #530209, #530210)
* Set dedicated cvar to 1 by default, to not advertise unconfigured servers
to the master server; use "+set dedicated 2" to advertise your server
(Closes: 485579)
diff --git a/debian/changelog b/debian/changelog
index f25cb44..8e90ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ tremulous (1.1.0-5) UNRELEASED; urgency=low
from ioquake3 bug 3756, which just uses the OS's memcpy()
* Apply patch from ioquake3 bug 4331 to fix invalid use of strcpy
(Closes: #583939)
+ * Fix tremulous --help and tremulous-server --help (Closes: #566530)
+ * Remove bashisms from those script wrappers (Closes: #530209, #530210)
+ * Set dedicated cvar to 1 by default, to not advertise unconfigured servers
+ to the master server; use "+set dedicated 2" to advertise your server
+ (Closes: 485579)
-- Simon McVittie <smcv at debian.org> Mon, 12 Jul 2010 22:22:25 +0100
diff --git a/debian/scripts/tremulous b/debian/scripts/tremulous
index 542d125..dfe45b6 100644
--- a/debian/scripts/tremulous
+++ b/debian/scripts/tremulous
@@ -4,16 +4,28 @@ BINARY="/usr/lib/tremulous/tremulous"
BASE_PATH="/usr/share/games/tremulous"
QUIET=0
+excuse ()
+{
+cat << END
+Tremulous client wrapper
+
+Usage:
+ -h, --help Display this help
+ -q, --quiet Disable console output
+ +FOO Execute the console command FOO
+END
+}
+
# Tremulous 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" -o "$1" = "+connect" ]; then
- break;
- fi
case "$1" in
+ +*)
+ break
+ ;;
-h|--help)
- echo -e ${EXCUSE}
+ excuse
exit 0
;;
-q|--quiet)
@@ -26,9 +38,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} +set fs_basepath ${BASE_PATH} +set ttycon 0 "$@" >/dev/null 2>&1
else
- exec ${BINARY} +set fs_basepath ${BASE_PATH} $*
+ exec ${BINARY} +set fs_basepath ${BASE_PATH} "$@"
fi
exit $?
diff --git a/debian/scripts/tremulous-server b/debian/scripts/tremulous-server
index 6efa87f..36c0cb8 100644
--- a/debian/scripts/tremulous-server
+++ b/debian/scripts/tremulous-server
@@ -4,22 +4,39 @@ BINARY="/usr/lib/tremulous-server/tremded"
BASE_PATH="/usr/share/games/tremulous"
CONFIG_FILE="server.cfg"
+excuse ()
+{
+cat << END
+Tremulous server wrapper
+
+Usage:
+ -h, --help Display this help
+ -q, --quiet Disable console output
+ +FOO Execute the console command FOO
+ +set dedicated 2 Advertise this server to the master server
+END
+}
+
+
# Tremulous 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
+ +*)
+ break
+ ;;
-h|--help)
- echo -e ${EXCUSE}
- exit 0;
+ excuse
+ exit 0
+ ;;
+ -q|--quiet)
+ QUIET=1
;;
esac
+ shift
}; done
# Ready to rumble!
-exec ${BINARY} +set dedicated 2 +set fs_basepath ${BASE_PATH} +exec ${CONFIG_FILE} $*
-exit $?
+exec ${BINARY} +set dedicated 1 +set fs_basepath ${BASE_PATH} +exec ${CONFIG_FILE} "$@"
--
team based FPS game - packaging
More information about the Pkg-games-commits
mailing list