Update init script, bug #339352, bug #288599, thanks to Juanlu Pérez <juanluperez at gmail dot com>, Paolo Pedroni <paolo dot pedroni at iol dot it> and Michał Górny <mgorny at gentoo dot org>

Package-Manager: portage-2.1.8.3/cvs/Linux ia64

3 files changed, 21 insertions, 14 deletions

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index 2270b2c39df9..473e5a01ce61 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/deluge
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.150 2010/09/29 13:02:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.151 2010/10/02 15:36:03 armin76 Exp $
+
+  02 Oct 2010; Raúl Porcel <armin76@gentoo.org> files/deluged.init:
+  Update init script, bug #339352, bug #288599, thanks to Juanlu Pérez
+  <juanluperez at gmail dot com>, Paolo Pedroni <paolo dot pedroni at iol
+  dot it> and Michał Górny <mgorny at gentoo dot org>
 
 *deluge-1.3.0 (29 Sep 2010)
 
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 7368797d1cb5..520b0c27b9fb 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,6 +1,8 @@
 AUX deluge-1.2.2-versionsplit.patch 489 RMD160 4284a50f46e198d95bf40ef523b8fcf7dae30b00 SHA1 435e7b7f76c506fa7cd8ed366bad83a92bdcbfaa SHA256 88fc382fece21e29e73812487445045ce034383b3c2a09443c07345e436e2240
 AUX deluged.conf 184 RMD160 f1721fcc20b77836c783cbe4e7492748902f0428 SHA1 e330df742ae8f21e7dfbbaa31f181279ef96e3b8 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e7db8e4bc2b3d
-AUX deluged.init 2187 RMD160 6283e0f053c70c8ebbf19475db0da86313a027cc SHA1 408f2c44e45cbbdff36b13fcfe36b567565d5fd5 SHA256 1bb62e34d18e09268fa5491a2a102fc1e6566de19b006a2c34a12716d80ed023
+AUX deluged.init 2057 RMD160 1be6d3459ea5dfd912363755aebd5cbca90a6c85 SHA1 2260e7b5f48c255c8f8b59ad4e44c0eb8c76ac1f SHA256 c3c87e243d462fdc81329e22527ae2bd55f4d99bb1ca7d527aba343eec39516a
+AUX deluged.init.orig 2187 RMD160 6283e0f053c70c8ebbf19475db0da86313a027cc SHA1 408f2c44e45cbbdff36b13fcfe36b567565d5fd5 SHA256 1bb62e34d18e09268fa5491a2a102fc1e6566de19b006a2c34a12716d80ed023
+AUX deluged.init.rej 671 RMD160 6bd57fc0c8a86099d31c1f67c3f52ff4411a6462 SHA1 b484df8b3fec348c8ae645bc2d37f4deb8b7b385 SHA256 55fdad7d2da92fa5d5a6f2361d5947fdfa311aa0345b5cc9e4b94c19dc5e4ad9
 DIST deluge-1.2.0.tar.lzma 1317506 RMD160 354fb7bced4199e154588cf6a366159b6398cf79 SHA1 e5d1304bcd2ccb6282dfe26a1e9cc34b19ec782a SHA256 65cda2026feca770bead1e79c8fb7a562bb8aff09d025ebfe3947d2d191cae89
 DIST deluge-1.2.3.tar.lzma 1371844 RMD160 4a79dd7a864fa8ae47e6b3da9a5285801931c8dc SHA1 ab036af47a797c76f1a3211dcb47a89e90adf4a2 SHA256 9980c89c254b375da8a8a74478d1bd9001f3b525938f20bb0d97147ac4af6621
 DIST deluge-1.3.0.tar.lzma 1868859 RMD160 db7cb656e4be3f0eec75d645fc1924f67ae3e646 SHA1 c8dd1225b20e9e87e9debc3f3d8170636563dae1 SHA256 c04e588caee7d2897b8af81d3e3fa05372223e17da678410df9faac676dc2774
@@ -8,5 +10,5 @@ EBUILD deluge-1.2.0.ebuild 1674 RMD160 9c442a182e019f2d0465b0d79e06d181a1016ed3
 EBUILD deluge-1.2.3.ebuild 1679 RMD160 7f4a3c3ce7d2d2c4b49edffdbe0dfe1c7aae8878 SHA1 483e1f06e260a24017d3d6458f1ba2f559b28ac2 SHA256 c2aeee96510149cea2cfd61d2c9c5fba51a1616928f5e766955bee71991daecb
 EBUILD deluge-1.3.0.ebuild 1675 RMD160 dff52e49f204c36f43c587c07cfacd805fc3d402 SHA1 a047ab86f24ad8a971a9cfcf170bff41a2fd3249 SHA256 e56d24a41aaea105daa8651863e91f3ccb1058c00f3e2f879cc96da8d6a352fc
 EBUILD deluge-9999.ebuild 1603 RMD160 e4d125fca0e38b5655a3ebedd0ef93ed83a351c5 SHA1 2446f7df5c98d821dd6a02c8cc605856ea46007e SHA256 d0ad474095307c53e79a343714c6c38dcb251fc68f68123ac4fc90ddaa708f15
-MISC ChangeLog 21047 RMD160 6cf790aacdf391895136907b6d0cfb60a3bb4d79 SHA1 7ec582c26b22f9c191459e338dca5e0fdcc9ee1e SHA256 454f82b2008af832fb193a733e50c605032435d8767403db5d09d1b68aafd881
+MISC ChangeLog 21319 RMD160 67913731818491a10a494726f76e1d4ff92d1083 SHA1 0bbe81e0f5d3d727742896b2c6b0654c8976224f SHA256 d7ff75d8a66ceb10cb37285324eec426f474863b31b263e766d739d4fdbf8fe8
 MISC metadata.xml 322 RMD160 ba506cbedd76759bd1b14d569d0d121a1644fa75 SHA1 811976e88cb463281a74ac671ca920b9a15f15c3 SHA256 e88e99b119abf92a69e2115263e6992e6b2a6f711d810e6234c0cfaa21bc1d1f
diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index f9b2a306a405..b409a8901f55 100644
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -1,28 +1,28 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.5 2009/02/17 15:32:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.6 2010/10/02 15:36:03 armin76 Exp $
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [[ "${DELUGED_USER}" == "" ]] ; then
+	if [ "${DELUGED_USER}" = "" ] ; then
 		eerror "Please edit /etc/conf.d/deluged"
 		eerror "You have to specify a user to run deluged as, as we will not run it as root!"
 		eerror "Modify DELUGED_USER to your needs (you can also add a group, after a colon)"
 		return 1
 	fi
-	if ! `getent passwd | cut -d ':' -f 1 | grep $( echo "${DELUGED_USER}" | cut -d ':' -f 1 ) -sq` ; then
+	if ! getent passwd "${DELUGED_USER%:*}" >/dev/null ; then
 		eerror "Please edit /etc/conf.d/deluged"
 		eerror "Your user has to exist!"
 		return 1
 	fi
-	if ! `echo "${DELUGED_USER}" | grep ':' -sq` ; then
+	if [ "${DELUGED_USER%:*}" = "${DELUGED_USER}" ] ; then
 		return 0
 	else
-		if ! `cut -d ':' -f 1 /etc/group | grep $( echo "${DELUGED_USER}" | cut -d ':' -f 2 ) -sq` ; then
+		if ! getent group "${DELUGED_USER#*:}" >/dev/null ; then
 			eerror "Please edit /etc/conf.d/deluged"
 			eerror "Your group has to exist too!"
 			return 1
@@ -33,10 +33,10 @@ checkconfig() {
 
 start() {
 	checkconfig || return $?
-	if [[ "${DELUGED_HOME}" == "" ]] ; then
-		DELUGED_USER_HOME=`getent passwd | grep ^$( echo "${DELUGED_USER}" | cut -d ':' -f 1 ): | cut -d ':' -f 6`
+	if [ "${DELUGED_HOME}" = "" ] ; then
+		DELUGED_USER_HOME=$(getent passwd "${DELUGED_USER%:*}" | cut -d ':' -f 6)
 	else
-		DELUGED_USER_HOME="${DELUGED_HOME}"
+		DELUGED_USER_HOME=${DELUGED_HOME}
 	fi
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER}" \
@@ -45,7 +45,7 @@ start() {
 	eend $?
 
 	
-	if [[ "${DELUGEUI_START}" == "true" ]] ; then
+	if [ "${DELUGEUI_START}" = "true" ] ; then
 		ebegin "Starting Deluge"
 		start-stop-daemon --start --background --pidfile \
 		/var/run/deluge.pid  --make-pidfile \
@@ -62,7 +62,7 @@ stop() {
 	eend $?
 
 
-	if [[ "${DELUGEUI_START}" == "true" ]] ; then
+	if [ "${DELUGEUI_START}" = "true" ] ; then
 		ebegin "Stopping Deluge"
 		start-stop-daemon --stop --user "${DELUGED_USER}" \
 		--name deluge --pidfile /var/run/deluge.pid