From: Carlos Santos <casantos@datacom.ind.br>
Date: Mon, 16 Apr 2018 02:29:37 +0000 (-0300)
Subject: prosody: don't test if the binary exists in the init script
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e9eb40a96c70d789b7075e665183d74f371b0b86;p=buildroot.git

prosody: don't test if the binary exists in the init script

The test doesn't make sense. It just exits without any error if the
binary doesn't exist, which is silly.

Replace the DAEMON variable, which was used only once, by the full path
of the binary file.

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---

diff --git a/package/prosody/S50prosody b/package/prosody/S50prosody
index 84913a5f83..6fd33671fa 100644
--- a/package/prosody/S50prosody
+++ b/package/prosody/S50prosody
@@ -1,7 +1,6 @@
 #! /bin/sh
 
 NAME=prosody
-DAEMON=/usr/bin/$NAME
 
 # This must match the pidfile field in
 # /etc/prosody/prosody.cfg.lua
@@ -9,15 +8,12 @@ DAEMON=/usr/bin/$NAME
 PIDDIR=/var/run/$NAME
 PIDFILE=$PIDDIR/$NAME.pid
 
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
 case "$1" in
   start)
     printf "Starting $NAME: "
     mkdir -p $PIDDIR
     chown $NAME:$NAME $PIDDIR
-    start-stop-daemon -S -q -o -x $DAEMON -c $NAME
+    start-stop-daemon -S -q -o -x /usr/bin/prosody -c $NAME
     [ $? = 0 ] && echo "OK" || echo "FAIL"
     ;;
   stop)