From 0d407d02ffee9555bd9164f9727001546b5090fe Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 30 Jan 2022 16:16:45 +0100
Subject: [PATCH] fix curl downloading

---
 usr/bin/archboot-aarch64-iso.sh               |  5 +++--
 usr/bin/archboot-x86_64-iso.sh                |  7 +++----
 usr/lib/initcpio/install/archboot_secure_boot | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/usr/bin/archboot-aarch64-iso.sh b/usr/bin/archboot-aarch64-iso.sh
index 8de5a5aba..1c1e79aa1 100755
--- a/usr/bin/archboot-aarch64-iso.sh
+++ b/usr/bin/archboot-aarch64-iso.sh
@@ -98,8 +98,9 @@ _prepare_efitools_uefi () {
 _prepare_fedora_shim_bootloaders () {
     # Details on shim https://www.rodsbooks.com/efi-bootloaders/secureboot.html#initial_shim
     # add shim aa64 signed files from fedora
-    curl -s --create-dirs -L -O --output-dir "${_AARCH64}/EFI/BOOT/" "${_SHIM_URL}/mmaa64.efi"
-    curl -s --create-dirs -L -O --output-dir "${_AARCH64}/EFI/BOOT/" "${_SHIM_URL}/BOOTAA64.efi"
+    for i in mmaa64.efi BOOTAA64.efi; do
+        curl -s --create-dirs -L -O --output-dir "${_AARCH64}/EFI/BOOT/" "${_SHIM_URL}/${i}"
+    done
 }
 
 _prepare_uefi_image() {
diff --git a/usr/bin/archboot-x86_64-iso.sh b/usr/bin/archboot-x86_64-iso.sh
index d40459b3c..9fb78ef10 100755
--- a/usr/bin/archboot-x86_64-iso.sh
+++ b/usr/bin/archboot-x86_64-iso.sh
@@ -93,10 +93,9 @@ _prepare_efitools_uefi () {
 _prepare_fedora_shim_bootloaders () {
     # Details on shim https://www.rodsbooks.com/efi-bootloaders/secureboot.html#initial_shim
     # add shim x64 signed files from fedora
-    curl -s --create-dirs -L -O --output-dir "${_X86_64}/EFI/BOOT/" "${_SHIM_URL}/mmx64.efi"
-    curl -s --create-dirs -L -O --output-dir "${_X86_64}/EFI/BOOT/" "${_SHIM_URL}/BOOTX64.efi"
-    curl -s --create-dirs -L -O --output-dir "${_X86_64}/EFI/BOOT/" "${_SHIM_URL}/mmia32.efi"
-    curl -s --create-dirs -L -O --output-dir "${_X86_64}/EFI/BOOT/" "${_SHIM_URL}/BOOTIA32.efi"
+    for i in mmx64.efi BOOTX64.efi mmia32.efi BOOTIA32.efi; do
+        curl -s --create-dirs -L -O --output-dir "${_X86_64}/EFI/BOOT/" "${_SHIM_URL}/${i}"
+    done
 }
 
 _prepare_uefi_image() {
diff --git a/usr/lib/initcpio/install/archboot_secure_boot b/usr/lib/initcpio/install/archboot_secure_boot
index 6e565c9f9..7ff3dc415 100644
--- a/usr/lib/initcpio/install/archboot_secure_boot
+++ b/usr/lib/initcpio/install/archboot_secure_boot
@@ -49,16 +49,16 @@ build ()
     _SHIM_URL="https://pkgbuild.com/~tpowa/archboot-helper/fedora-shim"
     _SHIM=$(mktemp -d /var/tmp/shim.XXXX)
     if [[ "$(uname -m)" == "x86_64" ]]; then
-        curl -s --create-dirs -L -O --output-dir "${_SHIM}" "${_SHIM_URL}"/{mmx64.efi,shimx64.efi,mmia32.efi,shimia32.efi}
-        add_file "${_SHIM}/mmx64.efi" "/usr/share/archboot/fedora-shim/mmx64.efi"
-        add_file "${_SHIM}/shimx64.efi" "/usr/share/archboot/fedora-shim/shimx64.efi"
-        add_file "${_SHIM}/mmia32.efi" "/usr/share/archboot/fedora-shim/mmia32.efi"
-        add_file "${_SHIM}/shimia32.efi" "/usr/share/archboot/fedora-shim/shimia32.efi"
+        for i in shimx64.efi mmx64.efi mmia32.efi shimia32.efi; do
+            curl -s --create-dirs -L -O --output-dir "${_SHIM}" "${_SHIM_URL}"/"${i}"
+            add_file "${_SHIM}/${i}" "/usr/share/archboot/fedora-shim/${i}"
+        done
     fi
      if [[ "$(uname -m)" == "aarch64" ]]; then
-        curl -s --create-dirs -L -O --output-dir "${_SHIM}" "${_SHIM_URL}"/{mmaa64.efi,shimaa64.efi}
-        add_file "${_SHIM}/mmaa64.efi" "/usr/share/archboot/fedora-shim/mmaa64.efi"
-        add_file "${_SHIM}/shimaa64.efi" "/usr/share/archboot/fedora-shim/shimaa64.efi"
+             for i in mmaa64.efi shimaa64.efi; do
+            curl -s --create-dirs -L -O --output-dir "${_SHIM}" "${_SHIM_URL}"/"${i}"
+            add_file "${_SHIM}/${i}" "/usr/share/archboot/fedora-shim/${i}"
+        done
     fi
     # add generate keys script
     add_file "/usr/bin/archboot-secureboot-keys.sh" "/usr/bin/secureboot-keys.sh"