From d962dc7ff78d703e2b83c8728b809c1b58471aed Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 24 Jan 2023 14:56:44 +0100
Subject: [PATCH] add return 1

---
 usr/lib/archboot/installer/bootloader.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh
index 707f6984f..d44b9d56c 100644
--- a/usr/lib/archboot/installer/bootloader.sh
+++ b/usr/lib/archboot/installer/bootloader.sh
@@ -146,7 +146,9 @@ _do_uefi_common() {
         [[ -f "${_DESTDIR}/usr/bin/efi-readvar" ]] || _PACKAGES="${_PACKAGES} efitools"
         [[ -f "${_DESTDIR}/usr/bin/sbsign" ]] || _PACKAGES="${_PACKAGES} sbsigntools"
     fi
-    [[ -n "${_PACKAGES}" ]] && _run_pacman
+    if [[ -n "${_PACKAGES}" ]]; then
+        _run_pacman
+    fi
     _check_efisys_part || return 1
 }
 
@@ -174,7 +176,7 @@ _do_uefi_bootmgr_setup() {
 }
 
 _do_uefi_secure_boot_efitools() {
-    _do_uefi_common
+    _do_uefi_common || return 1
     # install helper tools and create entries in UEFI boot manager, if not present
     if [[ -n "${_UEFI_SECURE_BOOT}" ]]; then
         if [[ ! -f "${_UEFISYS_MP}/EFI/BOOT/HashTool.efi" ]]; then
@@ -389,7 +391,7 @@ CONFEOF
 }
 
 _do_efistub_uefi() {
-    _do_uefi_common
+    _do_uefi_common || return 1
     _do_efistub_parameters
     _common_bootloader_checks
     if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
@@ -845,7 +847,7 @@ _do_grub_bios() {
 }
 
 _do_grub_uefi() {
-    _do_uefi_common
+    _do_uefi_common || return 1
     [[ "${_UEFI_ARCH}" == "X64" ]] && _GRUB_ARCH="x86_64"
     [[ "${_UEFI_ARCH}" == "IA32" ]] && _GRUB_ARCH="i386"
     [[ "${_UEFI_ARCH}" == "AA64" ]] && _GRUB_ARCH="arm64"