gnunet: rc.d file still unusable

[ng0 <ng0%n0.is@localhost>]

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%n0.is@localhost>
Pushed By:	ng0
Date:		Fri Mar 1 00:31:48 2019 +0000
Changeset:	c7bebabfb100f7baaa4b39be83e0a06fcc130ddb

Modified Files:
	gnunet/files/gnunet.in

Log Message:
gnunet: rc.d file still unusable

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c7bebabfb100f7baaa4b39be83e0a06fcc130ddb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnunet/files/gnunet.in | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diffs:
diff --git a/gnunet/files/gnunet.in b/gnunet/files/gnunet.in
index 5a097c25b1..ecea074df4 100755
--- a/gnunet/files/gnunet.in
+++ b/gnunet/files/gnunet.in
@@ -33,31 +33,37 @@ reload_cmd="gnunet_reload"
 
 gnunet_chdir="${gnunet_home}"
 gnunet_env="HOME=${gnunet_home}"
+gnunet_env="${gnunet_env} USER=${gnunet_user}"
 
 gnunet_precmd()
 {
-	if [ -n "$(find @PKG_HOME@/.local/share/gnunet -maxdepth 1 -name gnunet.conf -perm +0044)" ]; then
-		echo "@PKG_HOME@/.local/share/gnunet/gnunet.conf"
-		echo "must not be world or group readable, use"
-		echo "chmod 600" 
-		echo "and chown @GNUNET_USER@:@GNUNET_GROUP@"
+	if [ -n "$(find @PKG_HOME@/.local/share/gnunet -maxdepth 1 -name gnunet.conf -perm 0044)" ]; then
+		warn "@PKG_HOME@/.local/share/gnunet/gnunet.conf"
+		warn "must not be world or group readable, use"
+		warn "chmod 600" 
+		warn "and chown @GNUNET_USER@:@GNUNET_GROUP@"
+		return 1
 	fi
 	if [ ! -d ${gnunet_home}/.cache/gnunet ]; then
 		mkdir -p ${gnunet_home}/.cache/gnunet
 	fi
+	if [ ! -f ${required_files} ]; then
+		warn "${required_files} does not exist."
+		return 1
+	fi
 }
 
 gnunet_start()
 {
 	@ECHO@ "Starting ${name}."
-	doit="@SU@ -m ${gnunet_user} -c '${command} -s ${command_args} -c @PKG_SYSCONFDIR@/gnunet.conf'"
+	doit="@SU@ -m ${gnunet_user} -c '${command} ${command_args} -s -c @PKG_SYSCONFDIR@/gnunet.conf'"
 	eval $doit
 }
 
 gnunet_stop()
 {
 	@ECHO@ "Stopping ${name}."
-	doit="@SU@ -m ${gnunet_user} -c '${command} -e ${command_args} -c @PKG_SYSCONFDIR@/gnunet.conf'"
+	doit="@SU@ -m ${gnunet_user} -c '${command} ${command_args} -e -c @PKG_SYSCONFDIR@/gnunet.conf'"
 	kill `cat ${pidfile}` 2>/dev/null
 	sleep 1
 	rm -rf /tmp/gnunet-gnunet-runtime 2>/dev/null 2>&1