From 5e71b6f80348bc1fece44e9d9b9f9d0ceaa22e47 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Mon, 23 Feb 2015 15:28:36 +0000 Subject: [PATCH] CLEANUP: extract temporary $CFG to eliminate duplication Signed-off-by: Adam Spiers --- examples/haproxy.init | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/haproxy.init b/examples/haproxy.init index 942d959c8..ae3ac0f90 100644 --- a/examples/haproxy.init +++ b/examples/haproxy.init @@ -32,19 +32,20 @@ if [ -L $0 ]; then BASENAME=`basename $BASENAME` fi -[ -f /etc/$BASENAME/$BASENAME.cfg ] || exit 1 +CFG=/etc/$BASENAME/$BASENAME.cfg +[ -f $CFG ] || exit 1 RETVAL=0 start() { - /usr/sbin/$BASENAME -c -q -f /etc/$BASENAME/$BASENAME.cfg + /usr/sbin/$BASENAME -c -q -f $CFG if [ $? -ne 0 ]; then echo "Errors found in configuration file, check it with '$BASENAME check'." return 1 fi echo -n "Starting $BASENAME: " - daemon /usr/sbin/$BASENAME -D -f /etc/$BASENAME/$BASENAME.cfg -p /var/run/$BASENAME.pid + daemon /usr/sbin/$BASENAME -D -f $CFG -p /var/run/$BASENAME.pid RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME @@ -62,7 +63,7 @@ stop() { } restart() { - /usr/sbin/$BASENAME -c -q -f /etc/$BASENAME/$BASENAME.cfg + /usr/sbin/$BASENAME -c -q -f $CFG if [ $? -ne 0 ]; then echo "Errors found in configuration file, check it with '$BASENAME check'." return 1 @@ -72,16 +73,16 @@ restart() { } reload() { - /usr/sbin/$BASENAME -c -q -f /etc/$BASENAME/$BASENAME.cfg + /usr/sbin/$BASENAME -c -q -f $CFG if [ $? -ne 0 ]; then echo "Errors found in configuration file, check it with '$BASENAME check'." return 1 fi - /usr/sbin/$BASENAME -D -f /etc/$BASENAME/$BASENAME.cfg -p /var/run/$BASENAME.pid -sf $(cat /var/run/$BASENAME.pid) + /usr/sbin/$BASENAME -D -f $CFG -p /var/run/$BASENAME.pid -sf $(cat /var/run/$BASENAME.pid) } check() { - /usr/sbin/$BASENAME -c -q -V -f /etc/$BASENAME/$BASENAME.cfg + /usr/sbin/$BASENAME -c -q -V -f $CFG } rhstatus() {