From 77dbecf494aec94e9eada617dd83b2a70fd8906b Mon Sep 17 00:00:00 2001 From: hayao Date: Sat, 19 Jun 2021 10:38:36 +0900 Subject: [PATCH] [fix] : Fixed SC2010 (make_efi) --- build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index dbd436cc..30784964 100755 --- a/build.sh +++ b/build.sh @@ -824,9 +824,8 @@ make_efi() { install -d -m 0755 -- "${isofs_dir}/loader/entries" sed "s|%ARCH%|${arch}|g;" "${script_path}/efiboot/${_use_config_name}/loader.conf" > "${isofs_dir}/loader/loader.conf" - readarray -t _efi_config_list < <(ls "${script_path}/efiboot/${_use_config_name}/archiso-usb"*".conf" | grep -v "rescue") - - [[ "${norescue_entry}" = false ]] && readarray -t -O "${#_efi_config_list}" _efi_config_list < <(ls "${script_path}/efiboot/${_use_config_name}/archiso-usb"*".conf" | grep -v "rescue") + readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f -name "archiso-usb*.conf" -printf "%f" | grep -v "rescue") + [[ "${norescue_entry}" = false ]] && readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f -name "archiso-usb*rescue*.conf" -printf "%f") for _efi_config in "${_efi_config_list[@]}"; do sed "s|%ARCHISO_LABEL%|${iso_label}|g; -- 2.11.0