Rewrote the init script, since it was in need of it. Also fixed bug #136727.

Package-Manager: portage-2.1

3 files changed, 66 insertions, 46 deletions

diff --git a/games-server/ut2004-ded/ChangeLog b/games-server/ut2004-ded/ChangeLog
index fd0b75c482d8..a08bf0b137b5 100644
--- a/games-server/ut2004-ded/ChangeLog
+++ b/games-server/ut2004-ded/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-server/ut2004-ded
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/ut2004-ded/ChangeLog,v 1.13 2006/03/31 21:49:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/ut2004-ded/ChangeLog,v 1.14 2006/06/14 18:43:28 wolf31o2 Exp $
+
+  14 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/ut2004-ded.rc:
+  Rewrote the init script, since it was in need of it.  Also fixed bug #136727.
 
   31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   ut2004-ded-3369.ebuild:
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
index 37a87bde1aa3..549887d30615 100644
--- a/games-server/ut2004-ded/Manifest
+++ b/games-server/ut2004-ded/Manifest
@@ -1,15 +1,31 @@
-MD5 9b11f4f4829bfa8848cfecfda57bb477 ChangeLog 2516
-RMD160 4c174147b18c2765a810139381fd5867a39f46b2 ChangeLog 2516
-SHA256 dbd67e824dadd095cbf691f5583517dffb415bf0716cd2bed3ea881c0ff2e0a8 ChangeLog 2516
-MD5 be2cbffcdf63c5d40ccf12ff6c65a89d files/digest-ut2004-ded-3369 157
-RMD160 6d7e7c3ad0919d47f36b4fbe7d7215cfb5e9d73f files/digest-ut2004-ded-3369 157
-SHA256 77d1db1f96cedfda2c7b241c161f03cebf51e68986e5e269fbcda3f2923cffe4 files/digest-ut2004-ded-3369 157
-MD5 d01741a71f471ffeb77693d4aba27877 files/ut2004-ded.rc 2515
-RMD160 af87205eb0b743811b6062200451c637d2127935 files/ut2004-ded.rc 2515
-SHA256 f730e2a31f573917331c5511f9e8e6781db4f5652d8a11defce8429ee39c1969 files/ut2004-ded.rc 2515
-MD5 f05d84780234f0c985ed7d5dc5f3ddb1 metadata.xml 646
-RMD160 5b9b7f3224f16e6f492868b070b3e656d04b0ec5 metadata.xml 646
-SHA256 6d795d2290247c8fd10237244c55ae53a45cc56b03e28c4ff40afb40db27f85a metadata.xml 646
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ut2004-ded.rc 1174 RMD160 fd19de06e73eff520cb945914764714b3e32d3b3 SHA1 ab22383a2c39dd445a8ae71c9d91163eadbc456a SHA256 be57050434b7f942434b5a2295b7343c196f3c337c9e16890b405768014f7251
+MD5 8583279979c71d5ccf3139447241a904 files/ut2004-ded.rc 1174
+RMD160 fd19de06e73eff520cb945914764714b3e32d3b3 files/ut2004-ded.rc 1174
+SHA256 be57050434b7f942434b5a2295b7343c196f3c337c9e16890b405768014f7251 files/ut2004-ded.rc 1174
+DIST dedicatedserver3339-bonuspack.zip 914213907
+DIST ut2004-lnxpatch3369-2.tar.bz2 22465217
+EBUILD ut2004-ded-3369.ebuild 2407 RMD160 0e13ecc5b8ed6fe9858b2e1c9507477e6ea37dbd SHA1 94f5134bdb0e3e2aa3cffe077fe18bc3782fc43e SHA256 8d94f04e8611053afb0c3816c80a73ab18336ad4220da8f0ba214ea72edf9377
 MD5 7ba8361bd54b6472f8a4d469a3ec47e0 ut2004-ded-3369.ebuild 2407
 RMD160 0e13ecc5b8ed6fe9858b2e1c9507477e6ea37dbd ut2004-ded-3369.ebuild 2407
 SHA256 8d94f04e8611053afb0c3816c80a73ab18336ad4220da8f0ba214ea72edf9377 ut2004-ded-3369.ebuild 2407
+MISC ChangeLog 2672 RMD160 e6466b76579866fe802408b37fb47fccd5888aaa SHA1 2a2a1fe700ded3bc2fa143a40d0ca9d787966116 SHA256 6cfadee5ed10ea630bb3169d4ff20bb4c23f2791ea96f03f3ea345a7a49447d6
+MD5 a72470a4fb2d7b98a9e0aeb0d1d9ee74 ChangeLog 2672
+RMD160 e6466b76579866fe802408b37fb47fccd5888aaa ChangeLog 2672
+SHA256 6cfadee5ed10ea630bb3169d4ff20bb4c23f2791ea96f03f3ea345a7a49447d6 ChangeLog 2672
+MISC metadata.xml 646 RMD160 5b9b7f3224f16e6f492868b070b3e656d04b0ec5 SHA1 84425d7645f7f18479208d6600f362fcdb58ec2f SHA256 6d795d2290247c8fd10237244c55ae53a45cc56b03e28c4ff40afb40db27f85a
+MD5 f05d84780234f0c985ed7d5dc5f3ddb1 metadata.xml 646
+RMD160 5b9b7f3224f16e6f492868b070b3e656d04b0ec5 metadata.xml 646
+SHA256 6d795d2290247c8fd10237244c55ae53a45cc56b03e28c4ff40afb40db27f85a metadata.xml 646
+MD5 be2cbffcdf63c5d40ccf12ff6c65a89d files/digest-ut2004-ded-3369 157
+RMD160 6d7e7c3ad0919d47f36b4fbe7d7215cfb5e9d73f files/digest-ut2004-ded-3369 157
+SHA256 77d1db1f96cedfda2c7b241c161f03cebf51e68986e5e269fbcda3f2923cffe4 files/digest-ut2004-ded-3369 157
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEkFjYkT4lNIS36YERAjOYAJ47YysVSSLBP40IXetjNisWa555bgCfbRRm
+PM0S0jBgK3NUF4lmZ9524Ro=
+=bZU5
+-----END PGP SIGNATURE-----
diff --git a/games-server/ut2004-ded/files/ut2004-ded.rc b/games-server/ut2004-ded/files/ut2004-ded.rc
index 88981a1060d9..f6d4af745acc 100644
--- a/games-server/ut2004-ded/files/ut2004-ded.rc
+++ b/games-server/ut2004-ded/files/ut2004-ded.rc
@@ -1,39 +1,40 @@
 #!/sbin/runscript 
-#UT2004 Dedicated Server Runscript by Ken Smith                                                                                                                                                              
-#change the following two variables to customize this script
-#default script starts up a Onslaught Server
-#goto www.unrealadmin.org to learn how to edit your options
-                                                                                                                                                              
+
+# 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="/opt/ut2004-ded/System"
 OPTIONS="server ONS-Torlan?game=Onslaught.ONSOnslaughtGame ini=Default.ini log=server.log -nohomedir"
-                                                                                                                                                              
-                                                                                                                                                              
-#don't edit below here or the world will explode 
-                                                                                                                                                              
-depend() { 
-        need net 
-} 
-                                                                                                                                                              
-start() { 
-        ebegin "Starting UT2004 Dedicated Server" 
-        cd $UCCDIR 
-        start-stop-daemon --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 
+
+### 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 $? 
+	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 $?
 }