commit 922a37b2fbde86ff29fd5794c19e49764cb32370
author Adam Spiers <aspiers@suse.com> Mon Feb 23 15:28:38 2015 +0000
committer Willy Tarreau <w@1wt.eu> Mon Feb 23 18:13:14 2015 +0100
tree 86fb57732b363cae0aebd6b8ba7511a54cfce3a5
parent 85bb5ca39bfa72999759c3aa7356a74d771662c5

CLEANUP: extract temporary $PIDFILE to eliminate duplication

Signed-off-by: Adam Spiers <aspiers@suse.com>

examples/haproxy.init

diff --git a/examples/haproxy.init b/examples/haproxy.init
index 938721c..2bed3eb 100644
--- a/examples/haproxy.init
+++ b/examples/haproxy.init
@@ -37,6 +37,8 @@
 CFG=/etc/$BASENAME/$BASENAME.cfg
 [ -f $CFG ] || exit 1
 
+PIDFILE=/var/run/$BASENAME.pid
+
 RETVAL=0
 
 start() {
@@ -47,7 +49,7 @@
   fi
 
   echo -n "Starting $BASENAME: "
-  daemon $BIN -D -f $CFG -p /var/run/$BASENAME.pid
+  daemon $BIN -D -f $CFG -p $PIDFILE
   RETVAL=$?
   echo
   [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME
@@ -60,7 +62,7 @@
   RETVAL=$?
   echo
   [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$BASENAME
-  [ $RETVAL -eq 0 ] && rm -f /var/run/$BASENAME.pid
+  [ $RETVAL -eq 0 ] && rm -f $PIDFILE
   return $RETVAL
 }
 
@@ -80,7 +82,7 @@
     echo "Errors found in configuration file, check it with '$BASENAME check'."
     return 1
   fi
-  $BIN -D -f $CFG -p /var/run/$BASENAME.pid -sf $(cat /var/run/$BASENAME.pid)
+  $BIN -D -f $CFG -p $PIDFILE -sf $(cat $PIDFILE)
 }
 
 check() {