From 7a9dea975439fc4894107f9c124d5874cc416c84 Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Wed, 10 Oct 2018 12:56:48 +0200
Subject: [PATCH] Improve quoting.

---
 .../__consul_agent/files/consul.sysv-redhat   | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/cdist/conf/type/__consul_agent/files/consul.sysv-redhat b/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
index e9c869e5..58fc9bd9 100644
--- a/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
+++ b/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
@@ -11,51 +11,52 @@
 # pidfile: /var/run/consul/pidfile
 
 # Source function library.
+
 # shellcheck disable=SC1091
 . /etc/init.d/functions
 NAME=consul
 CONSUL=/usr/local/bin/consul
-CONFIG=/etc/$NAME/conf.d
-PID_FILE=/var/run/$NAME/pidfile
-LOG_FILE=/var/log/$NAME
+CONFIG="/etc/$NAME/conf.d"
+PID_FILE="/var/run/$NAME/pidfile"
+LOG_FILE="/var/log/$NAME"
 
 # shellcheck disable=SC1090
-[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
-export GOMAXPROCS=${GOMAXPROCS:-2}
+[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME"
+export GOMAXPROCS="${GOMAXPROCS:-2}"
 
-mkdir -p /var/run/$NAME
-chown consul:consul /var/run/$NAME
-chmod 2770 /var/run/$NAME
+mkdir -p "/var/run/$NAME"
+chown consul:consul "/var/run/$NAME"
+chmod 2770 "/var/run/$NAME"
 
 
 start() {
-   printf "Starting %s" "$NAME: "
+   printf "Starting %s: " "$NAME"
    daemon --user=consul \
       --pidfile="$PID_FILE" \
       "$CONSUL" agent -pid-file="$PID_FILE" -config-dir "$CONFIG" >> "$LOG_FILE" &
    retcode=$?
-   touch /var/lock/subsys/$NAME
-   return $retcode
+   touch "/var/lock/subsys/$NAME"
+   return "$retcode"
 }
 
 stop() {
-   printf "Shutting down %s" "$NAME: "
-   killproc -p "$PID_FILE" $NAME
+   printf "Shutting down %s: " "$NAME"
+   killproc -p "$PID_FILE" "$NAME"
    retcode=$?
-   rm -f /var/lock/subsys/$NAME
-   return $retcode
+   rm -f "/var/lock/subsys/$NAME"
+   return "$retcode"
 }
 
 case "$1" in
    start)
-      if status -p "$PID_FILE" $NAME >/dev/null; then
+      if status -p "$PID_FILE" "$NAME" >/dev/null; then
          echo "$NAME already running"
       else
          start
       fi
    ;;
    stop)
-      if status -p "$PID_FILE" $NAME >/dev/null; then
+      if status -p "$PID_FILE" "$NAME" >/dev/null; then
          stop
       else
          echo "$NAME not running"
@@ -65,25 +66,25 @@ case "$1" in
       "$CONSUL" info
    ;;
    status)
-      status -p "$PID_FILE" $NAME
+      status -p "$PID_FILE" "$NAME"
       exit $?
    ;;
    restart)
-      if status -p "$PID_FILE" $NAME >/dev/null; then
+      if status -p "$PID_FILE" "$NAME" >/dev/null; then
          stop
       fi
       start
    ;;
    reload)
-      if status -p "$PID_FILE" $NAME >/dev/null; then
+      if status -p "$PID_FILE" "$NAME" >/dev/null; then
          kill -HUP "$(cat "$PID_FILE")"
       else
          echo "$NAME not running"
       fi
    ;;
    condrestart)
-      if [ -f /var/lock/subsys/$NAME ]; then
-         if status -p "$PID_FILE" $NAME >/dev/null; then
+      if [ -f "/var/lock/subsys/$NAME" ]; then
+         if status -p "$PID_FILE" "$NAME" >/dev/null; then
             stop
          fi
          start