From: Harald Hoyer <harald@redhat.com>
Date: Fri, 26 Mar 2021 09:29:33 +0000 (+0100)
Subject: fix(syslog): shellcheck for modules.d/98syslog
X-Git-Tag: 054~223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e1248da7d411604a6f7335c3dabe7a8a3dab3a7;p=thirdparty%2Fdracut.git

fix(syslog): shellcheck for modules.d/98syslog
---

diff --git a/modules.d/98syslog/.shchkdir b/modules.d/98syslog/.shchkdir
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules.d/98syslog/module-setup.sh b/modules.d/98syslog/module-setup.sh
index fdd010324..2909a5625 100755
--- a/modules.d/98syslog/module-setup.sh
+++ b/modules.d/98syslog/module-setup.sh
@@ -13,7 +13,6 @@ depends() {
 
 # called by dracut
 install() {
-    local _i
     local _installs
     if find_binary rsyslogd > /dev/null; then
         _installs="rsyslogd"
@@ -32,7 +31,7 @@ install() {
         inst_hook cleanup 99 "$moddir/syslog-cleanup.sh"
         inst_hook initqueue/online 70 "$moddir/rsyslogd-start.sh"
         inst_simple "$moddir/rsyslogd-stop.sh" /sbin/rsyslogd-stop
-        mkdir -m 0755 -p ${initdir}/etc/templates
+        mkdir -m 0755 -p "${initdir}"/etc/templates
         inst_simple "${moddir}/rsyslog.conf" /etc/templates/rsyslog.conf
     fi
     dracut_need_initqueue
diff --git a/modules.d/98syslog/parse-syslog-opts.sh b/modules.d/98syslog/parse-syslog-opts.sh
index eed080010..ccefd9de7 100755
--- a/modules.d/98syslog/parse-syslog-opts.sh
+++ b/modules.d/98syslog/parse-syslog-opts.sh
@@ -28,11 +28,11 @@ syslogserver=$(getarg syslog.server -d syslog)
 syslogfilters=$(getargs syslog.filter -d filter)
 syslogtype=$(getarg syslog.type -d syslogtype)
 
-[ -n "$syslogserver" ] && echo $syslogserver > /tmp/syslog.server
+[ -n "$syslogserver" ] && echo "$syslogserver" > /tmp/syslog.server
 [ -n "$syslogfilters" ] && echo "$syslogfilters" > /tmp/syslog.filters
 if [ -n "$syslogtype" ]; then
     echo "$syslogtype" > /tmp/syslog.type
 else
     syslogtype=$(detect_syslog)
-    echo $syslogtype > /tmp/syslog.type
+    echo "$syslogtype" > /tmp/syslog.type
 fi
diff --git a/modules.d/98syslog/rsyslogd-start.sh b/modules.d/98syslog/rsyslogd-start.sh
index 914669f9a..1066893e9 100755
--- a/modules.d/98syslog/rsyslogd-start.sh
+++ b/modules.d/98syslog/rsyslogd-start.sh
@@ -6,8 +6,8 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
 
 # prevent starting again if already running
 if [ -f /var/run/syslogd.pid ]; then
-    read pid < /var/run/syslogd.pid
-    kill -0 $pid && exit 0
+    read -r pid < /var/run/syslogd.pid
+    kill -0 "$pid" && exit 0
 fi
 
 rsyslog_config() {
@@ -18,7 +18,7 @@ rsyslog_config() {
     local filters=$*
     local filter=
 
-    cat $syslog_template
+    cat "$syslog_template"
 
     (
         # disable shell expansion / globbing
@@ -31,14 +31,14 @@ rsyslog_config() {
     #echo "*.* /tmp/syslog"
 }
 
-[ -f /tmp/syslog.type ] && read type < /tmp/syslog.type
-[ -f /tmp/syslog.server ] && read server < /tmp/syslog.server
-[ -f /tmp/syslog.filters ] && read filters < /tmp/syslog.filters
+[ -f /tmp/syslog.type ] && read -r type < /tmp/syslog.type
+[ -f /tmp/syslog.server ] && read -r server < /tmp/syslog.server
+[ -f /tmp/syslog.filters ] && read -r filters < /tmp/syslog.filters
 [ -z "$filters" ] && filters="kern.*"
-[ -f /tmp/syslog.conf ] && read conf < /tmp/syslog.conf
+[ -f /tmp/syslog.conf ] && read -r conf < /tmp/syslog.conf
 [ -z "$conf" ] && conf="/etc/rsyslog.conf" && echo "$conf" > /tmp/syslog.conf
 
-if [ $type = "rsyslogd" ]; then
+if [ "$type" = "rsyslogd" ]; then
     template=/etc/templates/rsyslog.conf
     if [ -n "$server" ]; then
         rsyslog_config "$server" "$template" "$filters" > $conf
diff --git a/modules.d/98syslog/rsyslogd-stop.sh b/modules.d/98syslog/rsyslogd-stop.sh
index d810079b3..3fc2a5f70 100755
--- a/modules.d/98syslog/rsyslogd-stop.sh
+++ b/modules.d/98syslog/rsyslogd-stop.sh
@@ -5,9 +5,9 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
 # Kills rsyslogd
 
 if [ -f /var/run/syslogd.pid ]; then
-    read pid < /var/run/syslogd.pid
-    kill $pid
-    kill -0 $pid && kill -9 $pid
+    read -r pid < /var/run/syslogd.pid
+    kill "$pid"
+    kill -0 "$pid" && kill -9 "$pid"
 else
     warn "rsyslogd-stop: Could not find a pid for rsyslogd. Won't kill it."
 fi
diff --git a/modules.d/98syslog/syslog-cleanup.sh b/modules.d/98syslog/syslog-cleanup.sh
index 05cce5faf..2d08d8a7e 100755
--- a/modules.d/98syslog/syslog-cleanup.sh
+++ b/modules.d/98syslog/syslog-cleanup.sh
@@ -5,9 +5,9 @@
 type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
 
 if [ -f /tmp/syslog.server ]; then
-    read syslogtype < /tmp/syslog.type
+    read -r syslogtype < /tmp/syslog.type
     if command -v "${syslogtype}-stop" > /dev/null; then
-        ${syslogtype}-stop
+        "${syslogtype}"-stop
     else
         warn "syslog-cleanup: Could not find script to stop syslog of type \"$syslogtype\". Syslog will not be stopped."
     fi