From be7f5a783a79c7327718ac326f78e2b634b5458d Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 7 Jan 2023 14:30:34 +0100
Subject: [PATCH] correct CANCEL

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

diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh
index 16adb034e..1fbdb3043 100644
--- a/usr/lib/archboot/installer/bootloader.sh
+++ b/usr/lib/archboot/installer/bootloader.sh
@@ -965,7 +965,7 @@ install_bootloader_uefi() {
             "GRUB_UEFI" "GRUB(2) for ${_UEFI_ARCH} UEFI" 2>"${ANSWER}" || CANCEL=1
         case $(cat "${ANSWER}") in
             "EFISTUB") do_efistub_uefi
-                       [[ "${CANCEL}" == "" ]] && do_efistub_copy_to_efisys
+                       [[ -z "${CANCEL}" ]] && do_efistub_copy_to_efisys
                         ;;
             "GRUB_UEFI") do_grub_uefi ;;
         esac
@@ -974,7 +974,7 @@ install_bootloader_uefi() {
 
 choose_bootloader() {
     if [[ "${_DETECTED_UEFI_BOOT}" == "1" ]]; then
-        install_bootloader_uefi || return 1
+        install_bootloader_uefi
     else
         if [[ "${RUNNING_ARCH}" == "aarch64" || "${RUNNING_ARCH}" == "riscv64" ]]; then
             do_uboot
@@ -996,7 +996,7 @@ install_bootloader() {
     detect_uefi_boot
     do_uefi_setup_env_vars
     NEXTITEM="7"
-    choose_bootloader || return 1
-    NEXTITEM="8"
+    choose_bootloader
+    [[ -z "${CANCEL}" ]] && NEXTITEM="8"
 }