Changing SHAREDIR to LOCAL_DIR in start scripts and einfo in ebuild (see bug #76278)

(Portage version: 1.589-cvs)

4 files changed, 27 insertions, 15 deletions

diff --git a/net-p2p/gift/ChangeLog b/net-p2p/gift/ChangeLog
index 32e6b5f00491..071c5857f3c9 100644
--- a/net-p2p/gift/ChangeLog
+++ b/net-p2p/gift/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/gift
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/ChangeLog,v 1.56 2005/09/06 21:12:59 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/ChangeLog,v 1.57 2005/09/16 23:32:20 mkay Exp $
+
+  16 Sep 2005; <mkay@gentoo.org> files/gift.confd, files/gift.initd,
+  gift-0.11.8.1.ebuild:
+  Changing SHAREDIR to LOCAL_DIR in start scripts and einfo in ebuild
+  (see bug #76278)
 
   06 Sep 2005; Karol Wojtaszek <sekretarz@gentoo.org> gift-0.11.7-r1.ebuild,
   gift-0.11.8.1.ebuild:
diff --git a/net-p2p/gift/files/gift.confd b/net-p2p/gift/files/gift.confd
index 6a4167958d73..52d5a99b27f9 100644
--- a/net-p2p/gift/files/gift.confd
+++ b/net-p2p/gift/files/gift.confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/files/gift.confd,v 1.3 2004/07/15 00:20:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/files/gift.confd,v 1.4 2005/09/16 23:32:20 mkay Exp $
 
 # /etc/conf.d/gift
 # Config file for gift control script
@@ -12,8 +12,8 @@
 # owner of giFTd process (don't change, must be existing)
 USER="p2p"
 
-# where the shared directory is
-SHAREDIR="/usr/share/giFT"
+# directory with configuration
+LOCAL_DIR="/usr/share/giFT"
 
 # logfile (/dev/null for nowhere)
 LOG="/var/log/giftd.log"
diff --git a/net-p2p/gift/files/gift.initd b/net-p2p/gift/files/gift.initd
index 8607c59c5559..4e624bc21035 100644
--- a/net-p2p/gift/files/gift.initd
+++ b/net-p2p/gift/files/gift.initd
@@ -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-p2p/gift/files/gift.initd,v 1.5 2004/08/05 21:23:53 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/files/gift.initd,v 1.6 2005/09/16 23:32:20 mkay Exp $
 
 depend() {
 	need net
@@ -10,13 +10,15 @@ depend() {
 start() {
 	ebegin "Starting giFTd"
 	start-stop-daemon --quiet --start -c ${USER} --make-pidfile \
-		--pidfile /var/run/giftd.pid --exec /usr/bin/giftd -- \
-		--local-dir=${SHAREDIR} &>${LOG} &
-	for i in `pgrep -u ${USER} giftd`
-	do
-		renice ${NICE} -p $i > /dev/null
-	done
-	eend $?
+		--pidfile /var/run/giftd.pid --exec /usr/bin/giftd \
+		--nicelevel ${NICE} -- \
+		--local-dir=${LOCAL_DIR} &>${LOG} &
+		result=$?
+	[ -z "`pgrep -u ${USER} giftd`" ] && result=1
+	if [ $result -eq 1 ]; then
+		eerror "Failed to start gift. Check ${LOG} for more information"
+	fi;
+	eend $result
 }
 
 stop() {
diff --git a/net-p2p/gift/gift-0.11.8.1.ebuild b/net-p2p/gift/gift-0.11.8.1.ebuild
index 91131f5bd3e4..7ddff1ea61f0 100644
--- a/net-p2p/gift/gift-0.11.8.1.ebuild
+++ b/net-p2p/gift/gift-0.11.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/gift-0.11.8.1.ebuild,v 1.2 2005/09/06 21:12:59 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/gift-0.11.8.1.ebuild,v 1.3 2005/09/16 23:32:20 mkay Exp $
 
 inherit eutils libtool
 
@@ -44,8 +44,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "First, you need to run gift-setup with your normal"
-	einfo "user account to create the giFT configuration files."
+	einfo "Configure gift in /usr/share/giFT/ or run gift-setup"
+	einfo "as normal user and make:"
+	einfo 'cp -R $HOME/.giFT/* /usr/share/giFT/'
+	einfo "chown -R p2p:root /usr/share/giFT/*"
+	einfo "(be carefull while specyfing directories in gift-setup;"
+	einfo "keep in mind that giFT will run as process of user "
+	einfo 'specified in /etc/conf.d/gift with his $HOME directory)'
 	echo
 	einfo "Also, if you will be using the giFT init script, you"
 	einfo "will need to create /usr/share/giFT/giftd.conf"