From 34f745673dd0065c165acdf4d6b1b02623cd47f0 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 7 Feb 2023 22:10:47 +0100
Subject: [PATCH] better error handling

---
 usr/lib/archboot/installer/pacman.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh
index b22a38b0d..bfcd8b466 100644
--- a/usr/lib/archboot/installer/pacman.sh
+++ b/usr/lib/archboot/installer/pacman.sh
@@ -115,7 +115,10 @@ _prepare_pacman() {
     done
     [[ -e /etc/systemd/system/pacman-init.service ]] && systemctl stop pacman-init.service
     _dialog --infobox "Refreshing package database..." 3 40
-    ${_PACMAN} -Sy &>"${_LOG}" || (_dialog --msgbox "Pacman preparation failed! Check ${_LOG} for errors." 6 60; return 1)
+    if ! ${_PACMAN} -Sy &>"${_LOG}"; then
+        _dialog --msgbox "Pacman preparation failed! Check ${_LOG} for errors." 6 60
+        return 1
+    fi
     _dialog --infobox "Update Arch Linux keyring..." 3 40
     _KEYRING="archlinux-keyring"
     [[ "${_RUNNING_ARCH}" == "aarch64" ]] && _KEYRING="${_KEYRING} archlinuxarm-keyring"