Minor QA: quoting & fixed init script to actually be able to start daemon after stopping it. Thanks to WayneSherman in bug #197948

Package-Manager: portage-2.1.4.4

4 files changed, 20 insertions, 19 deletions

diff --git a/net-misc/zebedee/ChangeLog b/net-misc/zebedee/ChangeLog
index 21280a7c4887..1ce7bb89caf3 100644
--- a/net-misc/zebedee/ChangeLog
+++ b/net-misc/zebedee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/zebedee
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.20 2007/10/31 03:28:14 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.21 2008/06/14 03:35:44 darkside Exp $
+
+  14 Jun 2008; Jeremy Olexa <darkside@gentoo.org> files/zebedee,
+  zebedee-2.4.1-r1.ebuild:
+  Minor QA: quoting & fixed init script to actually be able to start daemon
+  after stopping it. Thanks to WayneSherman in bug #197948
 
   31 Oct 2007; Mike Frysinger <vapier@gentoo.org> zebedee-2.5.3.ebuild:
   Use doinitd rather than newinitd #197482.
diff --git a/net-misc/zebedee/Manifest b/net-misc/zebedee/Manifest
index 051bab69965d..66351b851825 100644
--- a/net-misc/zebedee/Manifest
+++ b/net-misc/zebedee/Manifest
@@ -1,7 +1,7 @@
-AUX zebedee 796 RMD160 8161d6985be2efd5814bbf18689cd93b68325b17 SHA1 91ec14a73bc205df81e5ca2a00384ff6533b68fd SHA256 7ea50cf317accd6cbe1096684c3264ee4577c4772ce8299c23015c2dde0271d1
+AUX zebedee 617 RMD160 8e59c9b9f0204a276790af8e550d8a19bc46774d SHA1 d638e0ebf58bd42a3cf08743cdd8cd7d4013ac42 SHA256 a176694de521b534c3e750361dc3648e02b9c5e361df06d737edea086f92d8f7
 DIST zebedee-2.4.1A.tar.gz 165200 RMD160 0078bcbb98a0dbdb72109baf3edc2367843850ee SHA1 d6a4a5dbc9805e2d8b5a82232bcbd9941fd21024 SHA256 2c56ec66c8e55773eb5deb2e74209e8b27b6c443829153df69e1823f46cf0d2d
 DIST zebedee-2.5.3.tar.gz 176088 RMD160 2b4bee4c5f66f59628308a6c300b4c9d0c854e30 SHA1 54717faade0275929163369942885cc448bc9986 SHA256 3da34c75f5ce18f66ad172618b80ede55eed7cb0d5de6e27c29753853235705e
-EBUILD zebedee-2.4.1-r1.ebuild 1348 RMD160 600acb12a871af5d0569e4e1db0a7c07cb5b2503 SHA1 a55b277b859c510693ac784514a5e7ee6e5c887c SHA256 3169778899dcc5fe782faaf6e083ae72ca43cfcdf57b5040b7786033e7b2a540
+EBUILD zebedee-2.4.1-r1.ebuild 1352 RMD160 2ec64f957e134fc27068b215449c13cdfda5b041 SHA1 e4a60ffe899e64c6d520b788691829a1397d399d SHA256 595b0603fb06ea6d99f06adcf7430c5fa359d5356d06b08b007f1215eb931c0b
 EBUILD zebedee-2.5.3.ebuild 1312 RMD160 521936c2eabc0d1f16eef2f264282bb9ed2a456b SHA1 e99378507da9fdc91bc01b8a47045afd5e278935 SHA256 b4c498e1dee8c0d22640db6c1015e1e1619ccb84d02591ec1d88d9e40c832622
-MISC ChangeLog 2596 RMD160 80dec9b43c67446b5844a245dfe624755c00e7a3 SHA1 8999325652d87c433397fa047d886c8e548f02ef SHA256 faa6f40cbf9799a41357182943485775af16081f88e08031885e46fd97b3949c
+MISC ChangeLog 2826 RMD160 e198889d072946c59f2d9a299a3883316fb925bb SHA1 ed3726d4a0c95b2a10667d4004af13b5c4a8c9d4 SHA256 34fa91ef47343021d13276b820c0088109e13ab2c08d672fe7f6294b45df21f9
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
diff --git a/net-misc/zebedee/files/zebedee b/net-misc/zebedee/files/zebedee
index 8bfef2a39fe9..c06f8c7192ca 100644
--- a/net-misc/zebedee/files/zebedee
+++ b/net-misc/zebedee/files/zebedee
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/files/zebedee,v 1.3 2004/07/15 00:16:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/files/zebedee,v 1.4 2008/06/14 03:35:45 darkside Exp $
 
 depend() {
 	need net
@@ -10,25 +10,21 @@ depend() {
 
 start() {
 	ebegin "Starting Zebedee"
-	start-stop-daemon --quiet --start --startas /usr/bin/zebedee \
+	start-stop-daemon --start --startas /usr/bin/zebedee \
 		-m -b -p /var/run/zebedee.pid \
 		-- -f /etc/zebedee/server.zbd
-	eend $? "Failed to start Zebedee"
+	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zebedee"
-	start-stop-daemon --quiet --stop \
-	-p /var/run/zebedee.pid
-	eend $? "Failed to stop Zebedee"
-
-	# clean stale pidfile
-	[ -f /var/run/zebedee.pid ] && rm -f /var/run/zebedee.pid
+	start-stop-daemon --stop -p /var/run/zebedee.pid
+	eend $? 
 }
 
 restart() {
 	ebegin "Restarting Zebedee"
 	svc_stop
 	svc_start
-	eend $? "Failed to restart Zebedee"
+	eend $? 
 }
diff --git a/net-misc/zebedee/zebedee-2.4.1-r1.ebuild b/net-misc/zebedee/zebedee-2.4.1-r1.ebuild
index e9a6df6cffe1..a933d92f8307 100644
--- a/net-misc/zebedee/zebedee-2.4.1-r1.ebuild
+++ b/net-misc/zebedee/zebedee-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.4.1-r1.ebuild,v 1.3 2007/04/28 17:04:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.4.1-r1.ebuild,v 1.4 2008/06/14 03:35:44 darkside Exp $
 
 MY_P="${P}A"
 DESCRIPTION="A simple, free, secure TCP and UDP tunnel program"
@@ -38,12 +38,12 @@ src_install() {
 		OS=linux \
 		install || die
 
-	rm -f ${D}/etc/zebedee/*.{txt,html}
+	rm -f "${D}"/etc/zebedee/*.{txt,html}
 
 	dodoc *.txt
 	dohtml *.html
 
-	doinitd ${FILESDIR}/zebedee
+	doinitd "${FILESDIR}"/zebedee
 }
 
 pkg_postinst() {