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

fix(resume): shellcheck for modules.d/95resume
---

diff --git a/modules.d/95resume/.shchkdir b/modules.d/95resume/.shchkdir
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh
index e7cfe4720..75a905d9a 100755
--- a/modules.d/95resume/parse-resume.sh
+++ b/modules.d/95resume/parse-resume.sh
@@ -30,9 +30,9 @@ if ! getarg noresume; then
 
         {
             printf "KERNEL==\"%s\", ACTION==\"add|change\", SYMLINK+=\"resume\"\n" \
-                ${resume#/dev/}
+                "${resume#/dev/}"
             printf "SYMLINK==\"%s\", ACTION==\"add|change\", SYMLINK+=\"resume\"\n" \
-                ${resume#/dev/}
+                "${resume#/dev/}"
         } >> /etc/udev/rules.d/99-resume-link.rules
 
         {
@@ -56,19 +56,22 @@ if ! getarg noresume; then
             printf -- '%s\n' ' RUN+="/sbin/initqueue --finished --unique --name 00resume echo %M:%m  > /sys/power/resume"'
         } >> /etc/udev/rules.d/99-resume.rules
 
+        # shellcheck disable=SC2016
         printf '[ -e "%s" ] && { ln -fs "%s" /dev/resume 2> /dev/null; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
-            "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh
+            "$resume" "$resume" "$hookdir" >> "$hookdir"/initqueue/settled/resume.sh
 
         {
             printf -- "%s" 'warn "Cancelling resume operation. Device not found.";'
+            # shellcheck disable=SC2016
             printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' "$hookdir"
-        } >> $hookdir/initqueue/timeout/resume.sh
+        } >> "$hookdir"/initqueue/timeout/resume.sh
 
         mv /lib/dracut/resume.sh /lib/dracut/hooks/pre-mount/10-resume.sh
     else
         {
             if [ -x /usr/sbin/resume ]; then
                 printf -- '%s' 'SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="suspend|swsuspend|swsupend",'
+                # shellcheck disable=SC2016
                 printf -- ' RUN+="/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s $tempnode"\n' "$a_splash"
             fi
             printf -- '%s' 'SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="suspend|swsuspend|swsupend",'
diff --git a/modules.d/95resume/resume.sh b/modules.d/95resume/resume.sh
index 065455efd..c808880b0 100755
--- a/modules.d/95resume/resume.sh
+++ b/modules.d/95resume/resume.sh
@@ -12,7 +12,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
             a_splash="-P splash=n"
             ;;
     esac
-    [ -x "$(command -v resume)" ] && command resume $a_splash "$resume"
+    [ -x "$(command -v resume)" ] && command resume "$a_splash" "$resume"
 
-    (readlink -fn $resume > /sys/power/resume) > /.resume
+    (readlink -fn "$resume" > /sys/power/resume) > /.resume
 }