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

fix(masterkey): shellcheck for modules.d/97masterkey
---

diff --git a/modules.d/97masterkey/.shchkdir b/modules.d/97masterkey/.shchkdir
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules.d/97masterkey/masterkey.sh b/modules.d/97masterkey/masterkey.sh
index 9f3fb52b6..acfb799d1 100755
--- a/modules.d/97masterkey/masterkey.sh
+++ b/modules.d/97masterkey/masterkey.sh
@@ -12,20 +12,17 @@ PCRLOCKNUM=11
 
 load_masterkey() {
     # read the configuration from the config file
+    # shellcheck disable=SC1090
     [ -f "${MASTERKEYSCONFIG}" ] \
-        && . ${MASTERKEYSCONFIG}
+        && . "${MASTERKEYSCONFIG}"
 
     # override the kernel master key path name from the 'masterkey=' parameter
     # in the kernel command line
-    MASTERKEYARG=$(getarg masterkey=)
-    [ $? -eq 0 ] \
-        && MASTERKEY=${MASTERKEYARG}
+    MASTERKEYARG=$(getarg masterkey=) && MASTERKEY=${MASTERKEYARG}
 
     # override the kernel master key type from the 'masterkeytype=' parameter
     # in the kernel command line
-    MASTERKEYTYPEARG=$(getarg masterkeytype=)
-    [ $? -eq 0 ] \
-        && MASTERKEYTYPE=${MASTERKEYTYPEARG}
+    MASTERKEYTYPEARG=$(getarg masterkeytype=) && MASTERKEYTYPE=${MASTERKEYTYPEARG}
 
     # set default values
     [ -z "${MASTERKEYTYPE}" ] \
@@ -53,7 +50,7 @@ load_masterkey() {
     fi
 
     # read the kernel master key blob
-    KEYBLOB=$(cat ${MASTERKEYPATH})
+    KEYBLOB=$(cat "${MASTERKEYPATH}")
 
     # add the 'load' prefix if the key type is 'trusted'
     [ "${MASTERKEYTYPE}" = "trusted" ] \