diff options
| author |   Gustavo Felisberto <humpback@gentoo.org> | 2004-07-05 17:06:14 +0000 |
|---|---|---|
| committer | Gustavo Felisberto <humpback@gentoo.org> | 2004-07-05 17:06:14 +0000 |
| commit | a12e753bc54cf014121eb93fdb03c2c96304fda3 (patch) | |
| tree | 58358283fab3dfda1aa3a2e1eaf44c0f97eecee3 /net-im | |
| parent | Split jpilot-syncmal plugin from jpilot ebuild (diff) | |
| download | historical-a12e753bc54cf014121eb93fdb03c2c96304fda3.tar.gz historical-a12e753bc54cf014121eb93fdb03c2c96304fda3.tar.bz2 historical-a12e753bc54cf014121eb93fdb03c2c96304fda3.zip | |
update to init script
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jabberd/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/jabberd/Manifest | 4 | ||||
| -rw-r--r-- | net-im/jabberd/files/jabber.rc6-r7 | 20 |
3 files changed, 17 insertions, 12 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index 1ee326db6107..8ce8dcb7d3bb 100644 --- a/net-im/jabberd/ChangeLog +++ b/net-im/jabberd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/jabberd # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.32 2004/07/03 18:54:29 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.33 2004/07/05 17:06:14 humpback Exp $ + + 05 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; files/jabber.rc6-r7: + New update to init script 03 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; -jabberd-1.4.3-r2.ebuild, jabberd-1.4.3-r3.ebuild, jabberd-2.0.ebuild: diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest index a2c6c6be93b5..aa4cda319983 100644 --- a/net-im/jabberd/Manifest +++ b/net-im/jabberd/Manifest @@ -1,14 +1,14 @@ -MD5 f4f5d9e3b20fb2e2e7c599e032711c02 ChangeLog 5060 +MD5 ffcf7b4a43b72065f3aed8be8de87a4d ChangeLog 5167 MD5 7732dd9bbfba799a4ed9beddd867f943 jabberd-1.4.3-r3.ebuild 5245 MD5 3722bebc05427c4b5f7df97ffc8b1563 jabberd-2.0.ebuild 4914 MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411 MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984 +MD5 cdc4f4c042b9e8b7d80f7ddd1eb9447d files/jabber.rc6-r7 1849 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r3 129 MD5 d07e9280a9fed9f133b6900d542a81df files/digest-jabberd-2.0 65 MD5 21c3cb29cea153dcc8832387a175f6c6 files/jabber-conf.d 533 MD5 6e3663408f58427247b1aa80adf4acb6 files/jabber.rc6-r5 880 MD5 add7951ae63442a72e870b0b0d843d79 files/jabber.rc6-r6 959 -MD5 e1f6ed68426e8999b240b1226eb4a9f7 files/jabber.rc6-r7 1814 MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934 MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303 MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387 diff --git a/net-im/jabberd/files/jabber.rc6-r7 b/net-im/jabberd/files/jabber.rc6-r7 index a4c74fc24ca4..355e1b8841ff 100644 --- a/net-im/jabberd/files/jabber.rc6-r7 +++ b/net-im/jabberd/files/jabber.rc6-r7 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r7,v 1.4 2004/06/24 00:33:16 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r7,v 1.5 2004/07/05 17:06:14 humpback Exp $ depend() { need net @@ -12,9 +12,11 @@ start() { ebegin "Starting main Jabber Component" if [ "${JABBERD}" = "jabberd14" ] then - if [ -z $(ps ax | grep `cat ${JPIDFILE}` | grep -v grep ) ] - then - rm -f ${JPIDFILE} + if [ -f ${JPIDFILE} ] then + if [ -z $(ps ax | grep `cat ${JPIDFILE}` | grep -v grep ) ] + then + rm -f ${JPIDFILE} + fi fi jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1 else @@ -40,14 +42,14 @@ start() { stop() { ebegin "Stopping main Jabber Component" - kill `cat ${JPIDFILE}` if [ "${JABBERD}" = "jabberd14" ] then + kill `cat ${JPIDFILE}` sleep 2 - if [ -f ${JPIDFILE} ]; then - kill -9 `cat ${JPIDFILE}` - rm -f ${JPIDFILE} - fi + if [ -f ${JPIDFILE} ]; then + kill -9 `cat ${JPIDFILE}` + rm -f ${JPIDFILE} + fi else ebegin " Router" start-stop-daemon --stop -q --pidfile /var/jabberd/pid/router.pid |