Fix invalid dir variable

leomeinel · leomeinel · commit 691d83d1a8b2 · 2025-03-28T05:45:19.000+01:00
diff --git a/cryptboot b/cryptboot
@@ -58,17 +58,18 @@ case "${1}" in
 systemd-boot-sign)
     # Sign files in TO_SIGN with UEFI secure boot keys
     echo "Signing kernel with UEFI secure boot keys..."
-    for dir in "${TO_SIGN[@]}"; do
+    for tmp_dir in "${TO_SIGN[@]}"; do
+        dir="${EFI_DIR}"/"${tmp_dir}"
         [[ -d "${dir}" ]] ||
             {
                 var_invalid_warning "${dir}" "TO_SIGN"
                 continue
             }
         shopt -s nocaseglob
-        for file in "${EFI_DIR}"/"${dir}"/*.efi; do
+        for file in "${dir}"/*.efi; do
             [[ -f "${file}" ]] ||
                 {
-                    var_invalid_warning "${file}" "${EFI_DIR}/${dir}/*.efi"
+                    var_invalid_warning "${file}" "${dir}/*.efi"
                     continue
                 }
             cryptboot-efikeys sign "${file}"

Original file line number	Diff line number	Diff line change
`@@ -58,17 +58,18 @@ case "${1}" in`
`58`	`58`	`systemd-boot-sign)`
`59`	`59`	`# Sign files in TO_SIGN with UEFI secure boot keys`
`60`	`60`	`echo "Signing kernel with UEFI secure boot keys..."`
`61`		`- for dir in "${TO_SIGN[@]}"; do`
	`61`	`+ for tmp_dir in "${TO_SIGN[@]}"; do`
	`62`	`+ dir="${EFI_DIR}"/"${tmp_dir}"`
`62`	`63`	`[[ -d "${dir}" ]] \|\|`
`63`	`64`	`{`
`64`	`65`	`var_invalid_warning "${dir}" "TO_SIGN"`
`65`	`66`	`continue`
`66`	`67`	`}`
`67`	`68`	`shopt -s nocaseglob`
`68`		`- for file in "${EFI_DIR}"/"${dir}"/*.efi; do`
	`69`	`+ for file in "${dir}"/*.efi; do`
`69`	`70`	`[[ -f "${file}" ]] \|\|`
`70`	`71`	`{`
`71`		`- var_invalid_warning "${file}" "${EFI_DIR}/${dir}/*.efi"`
	`72`	`+ var_invalid_warning "${file}" "${dir}/*.efi"`
`72`	`73`	`continue`
`73`	`74`	`}`
`74`	`75`	`cryptboot-efikeys sign "${file}"`