Enhance init script, thanks to Alex Kravtsov and Kevin Bowling on bug #238733

Package-Manager: portage-2.1.6.3/cvs/Linux 2.6.27-gentoo-r7 i686

4 files changed, 33 insertions, 7 deletions

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index 6e83009016d4..c2f7d50ebac7 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/deluge
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.104 2008/12/26 17:21:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.105 2008/12/28 12:00:27 armin76 Exp $
+
+  28 Dec 2008; Raúl Porcel <armin76@gentoo.org> files/deluged.conf,
+  files/deluged.init:
+  Enhance init script, thanks to Alex Kravtsov and Kevin Bowling on bug #238733
 
   26 Dec 2008; Raúl Porcel <armin76@gentoo.org> deluge-1.1.0_rc1.ebuild:
   Change SRC_URI to bz2
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 850350bf5d15..8490c176d793 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,5 +1,5 @@
-AUX deluged.conf 137 RMD160 a0adac9be7e0bab3f0d753cd33f244ad506736a1 SHA1 0a9df342e37b3617b15d6fff06f19460078f10cc SHA256 3dc1fb7fa039ac9a6079f396ba070518432d7c4b2541de2a9470a57c6ee1c755
-AUX deluged.init 1463 RMD160 68315bdb7f94a93f28878907aa993b1c38a28770 SHA1 b31830eadb534ff38c235e6b11a3f2c7f5c56402 SHA256 99f0de40bf0db18a854421dfa6f3746f3580d24b1d4e500a2395892e246e8226
+AUX deluged.conf 184 RMD160 f1721fcc20b77836c783cbe4e7492748902f0428 SHA1 e330df742ae8f21e7dfbbaa31f181279ef96e3b8 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e7db8e4bc2b3d
+AUX deluged.init 2095 RMD160 c59c11cd155df57fff4b36411193adc8854697b4 SHA1 39a07404899bb7367dbc0a52656d37264ec124ff SHA256 2f2467a739c6675d9731c2e83060022dcf1f95148ec3eaeb1f26f4e932f19b87
 DIST deluge-0.5.9.3.tar.gz 2215212 RMD160 a18f93bacba20cfbe97272a83c5d11e62f2b418b SHA1 5f3ca7bca298c335f1600d7787b1478577afadd5 SHA256 30e62996cdcb689a5f552432b286f392fa2e855a768e279b3390c0cdd090f251
 DIST deluge-1.0.5.tar.gz 2977891 RMD160 0e62f9cecfcbba772f70e9109a923b4d73f96e5e SHA1 77392df71ef5087aaac5e97ffb25ade589967073 SHA256 214a0984d8af0ad97fc90a070c743d789ce8c70bb3d5d68277730aadb57cee22
 DIST deluge-1.0.6.tar.gz 2567494 RMD160 bc797cf48689e1389c2cced9d74f3f041286693b SHA1 8427f10792ce45837d9b0b1fa3205fd94dc15752 SHA256 e64321dbd618ee80b5441abfa473c96a7eed653a0422c50d078359bef4d3c297
@@ -11,5 +11,5 @@ EBUILD deluge-1.0.6.ebuild 1714 RMD160 e5a7cf312109ccd60f5eeb53aa8a6b96a59a2e66
 EBUILD deluge-1.0.7.ebuild 1714 RMD160 92c79028cd4f5634cfd07f6b422015a8b071ca3c SHA1 43b3707a1dfb9030b043e4ba487a978e5a17f7b2 SHA256 82d44a27db723f0ac560e4c5f93764dd16eb061eba78dcad9c54cbe21a58dcab
 EBUILD deluge-1.1.0_rc1.ebuild 1792 RMD160 26497bed8d1a7b3402cd487953dc2021c36832b4 SHA1 ebc212fe725c5625ed39c0d1d5a5abd6ba5be688 SHA256 668cb3797b3b5332f5feed076f2ddec155bed0a732b0c9527725cd18909efae2
 EBUILD deluge-9999.ebuild 1725 RMD160 353efaee485d305e900b14a33cba55803b4f3ff3 SHA1 8f62852e44b312531bb3b4980342dc59b85fbbac SHA256 5d64c93bd0195cf04e0179b91c62618d552ba58a3bfb868d421ec78aa69cfa42
-MISC ChangeLog 14561 RMD160 46f3877169eb05de275bce00d6dc2e70e9441e8c SHA1 be11c42a434cda19a249f25033a999573511450c SHA256 da04e87f7e199c1ab20f46040c4e6cb3a527d6b2a6812e4d1439f21b8e000f2a
+MISC ChangeLog 14733 RMD160 e29bc128aeaf237122e40d4ea0dec1eb55acb74b SHA1 6783955eda7131630da45715590c054c888ab4ad SHA256 b1112161a651bea36e20ffc1bda239ce17f9ee26e7cb175b24da549314ff505c
 MISC metadata.xml 222 RMD160 0dc4b04f31dcc89402f87c352327fe327b3cf31f SHA1 540337d5841f15b43186e5858f9e24032567de08 SHA256 713b9d1548682d5c1c3686a7b0711acf065a8fa4f386883ace90359d3dceb966
diff --git a/net-p2p/deluge/files/deluged.conf b/net-p2p/deluge/files/deluged.conf
index a09d559c273f..1d4714c2fe2f 100644
--- a/net-p2p/deluge/files/deluged.conf
+++ b/net-p2p/deluge/files/deluged.conf
@@ -2,3 +2,6 @@
 # Change this to the user you want to run deluged as.
 # You may specify a group too, after a colon
 DELUGED_USER=""
+DELUGEUI_START="false"
+DELUGEUI_OPTS="-u web"
+
diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index 72307769d3c4..5ec69058ece4 100644
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 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.2 2008/07/07 10:39:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.3 2008/12/28 12:00:27 armin76 Exp $
 
 depend() {
 	need net
@@ -27,17 +27,28 @@ checkconfig() {
 			eerror "Your group has to exist too!"
 			return 1
 		fi
-	fi
+	fi	
 	return 0
 }
 
 start() {
 	checkconfig || return $?
+	DELUGED_USER_HOME=`getent passwd | grep $( echo "${DELUGED_USER}" | cut -d ':' -f 1 ) | cut -d ':' -f 6`
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER}" \
 	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
-	--exec /usr/bin/deluged -- --do-not-daemonize "${DELUGED_OPTS}"
+	--exec /usr/bin/deluged -c "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
 	eend $?
+
+	
+	if [[ "${DELUGEUI_START}" == "true" ]] ; then
+		ebegin "Starting Deluge"
+		start-stop-daemon --start --background --pidfile \
+		/var/run/deluge.pid  --make-pidfile \
+		--exec /usr/bin/deluge -c "${DELUGED_USER}" \
+		-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
+		eend $?
+	fi
 }
 
 stop() {
@@ -45,4 +56,12 @@ stop() {
 	start-stop-daemon --stop --user "${DELUGED_USER}" \
 	--name deluged --pidfile /var/run/deluged.pid
 	eend $?
+
+
+	if [[ "${DELUGEUI_START}" == "true" ]] ; then
+		ebegin "Stopping Deluge"
+		start-stop-daemon --stop --user "${DELUGED_USER}" \
+		--name deluge --pidfile /var/run/deluge.pid
+		eend $?
+	fi
 }