This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git

commit cff98e2d79084de91f75011459121e0cc0ee20c9
Author: Joan Touzet <[email protected]>
AuthorDate: Mon Jun 11 14:48:12 2018 -0700

    Fix init.d script, closes #22
---
 debian/couchdb.init | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/couchdb.init b/debian/couchdb.init
index 0fee249..2091dc2 100644
--- a/debian/couchdb.init
+++ b/debian/couchdb.init
@@ -44,11 +44,11 @@ do_usage() {
 }
 
 do_start_cmd() {
-    start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE}} \
+    start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE} 
--make-pidfile} \
         $START_ARGS \
         --startas $DAEMON --name $NAME --exec $DAEMON --test > /dev/null \
         || return 1
-    start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE}} \
+    start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE} 
--make-pidfile} \
         $START_ARGS \
         --startas $DAEMON --name $NAME --exec $DAEMON -- $DAEMON_ARGS \
         || return 2
@@ -67,10 +67,11 @@ do_stop_cmd() {
     RETVAL=2
     if [ ! -z "$PID" ]; then
         start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 \
-            --pid $PID
+            --pid $PIDFILE
         RETVAL="$?"
         [ "$RETVAL" = 2 ] && return 2
     fi
+    rm -f ${PIDFILE}
     return $RETVAL
 }
 

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to