From f07e695fc5eb1804b159d2ede31e7ee202b6b00b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 26 Mar 2021 10:29:31 +0100 Subject: [PATCH] fix(masterkey): shellcheck for modules.d/97masterkey --- modules.d/97masterkey/.shchkdir | 0 modules.d/97masterkey/masterkey.sh | 13 +++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 modules.d/97masterkey/.shchkdir 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" ] \ -- 2.47.3