Install ut2004-ded wrapper for "ucc-bin server"; depend on ut2004-bonuspack-{ece,mega} and remove files which are replaced by them to prevent collisons; improve init script

Package-Manager: portage-2.2_rc45/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 15 insertions, 49 deletions

diff --git a/games-server/ut2004-ded/files/ut2004-ded.confd b/games-server/ut2004-ded/files/ut2004-ded.confd
index 5ae995e94ddc..a485b12d221e 100644
--- a/games-server/ut2004-ded/files/ut2004-ded.confd
+++ b/games-server/ut2004-ded/files/ut2004-ded.confd
@@ -1,6 +1,9 @@
 # User and group the server should run as
-UT2004_DED_USER="@USER@"
-UT2004_DED_GROUP="@GROUP@"
+ut2004_ded_user="@USER@"
+ut2004_ded_group="@GROUP@"
+
+# Directory to use for HOME
+ut2004_ded_home="@HOME@"
 
 # Any extra options you want to pass to the server
-UT2004_DED_OPTS="DM-Deck17 -nohomedir -ini=Default.ini -log=/dev/null"
+ut2004_ded_opts="DM-Deck17"
diff --git a/games-server/ut2004-ded/files/ut2004-ded.initd b/games-server/ut2004-ded/files/ut2004-ded.initd
index c7c08fa0d1fb..5f4094593acf 100644
--- a/games-server/ut2004-ded/files/ut2004-ded.initd
+++ b/games-server/ut2004-ded/files/ut2004-ded.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/ut2004-ded/files/ut2004-ded.initd,v 1.1 2009/09/03 12:37:39 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/ut2004-ded/files/ut2004-ded.initd,v 1.2 2009/10/12 00:54:17 nyhm Exp $
 
 depend() {
 	need net
@@ -9,15 +9,18 @@ depend() {
 
 start() {
 	ebegin "Starting ut2004-ded"
-	start-stop-daemon --start --quiet --background \
-		--chuid ${UT2004_DED_USER}:${UT2004_DED_GROUP} \
-		--chdir "@DIR@" --exec "@DIR@/ucc-bin" -- \
-		server ${UT2004_DED_OPTS}
+	start-stop-daemon --start --quiet --background --make-pidfile \
+		--pidfile /var/run/ut2004-ded.pid \
+		--chuid ${ut2004_ded_user}:${ut2004_ded_group} \
+		--env HOME="${ut2004_ded_home}" \
+		--exec "@DIR@/ut2004-ded" \
+		-- ${ut2004_ded_opts}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ut2004-ded"
-	start-stop-daemon --stop --quiet --exec "@DIR@/ucc-bin"
+	start-stop-daemon --stop \
+		--pidfile /var/run/ut2004-ded.pid
 	eend $?
 }
diff --git a/games-server/ut2004-ded/files/ut2004-ded.rc b/games-server/ut2004-ded/files/ut2004-ded.rc
deleted file mode 100644
index 23939b49039d..000000000000
--- a/games-server/ut2004-ded/files/ut2004-ded.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript 
-
-# UT2004 Dedicated Server Runscript by Ken Smith 
-
-# Change the following two variables to customize this script.  The default
-# script starts up a Onslaught Server.
-# Goto http://www.unrealadmin.org to learn how to edit your options
-
-UCCDIR="GAMES_PREFIX_OPT/ut2004-ded/System"
-OPTIONS="server ONS-Torlan?game=Onslaught.ONSOnslaughtGame ini=Default.ini log=server.log -nohomedir"
-
-### Do not edit below here or the world will explode ###
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting UT2004 Dedicated Server"
-	cd ${UCCDIR}
-	start-stop-daemon --chdir ${UCCDIR} --env PWD=${UCCDIR} --make-pidfile --start --quiet --pidfile /var/run/ucc-bin.pid --exec ucc-bin -- ${OPTIONS} >> /dev/null &
-	eend $? "Failed to start UT2004 Dedicated Server"
-}
-
-stop() {
-	ebegin "Stopping UT2004 Dedicated Server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ucc-bin.pid -- >> /dev/null
-	eend $? "Failed to stop UT2004 Dedicated Server"
-	sleep 1
-} 
-
-reload() { 
-	if [[ ! -f /var/run/ucc-bin.pid ]] ; then
-		eerror "UT2004 Dedicated Server isn't running"
-		return 1
-	fi 
-	ebegin "Reloading UT2004 Dedicated Server"
-	kill -HUP `cat /var/run/ucc-bin.pid` &>/dev/null
-	eend $?
-}