From 9d21fb856b6d495d2ca18b290d1a8813c3e361eb Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 2 Aug 2023 13:49:02 +0200
Subject: [PATCH] don't clear on error'

---
 usr/bin/archboot-update.sh        | 9 +++------
 usr/lib/archboot/update/manage.sh | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/usr/bin/archboot-update.sh b/usr/bin/archboot-update.sh
index f0362ae09..608daceaa 100755
--- a/usr/bin/archboot-update.sh
+++ b/usr/bin/archboot-update.sh
@@ -42,14 +42,12 @@ echo -e "\e[1mInformation:\e[m Logging is done on \e[1m/dev/tty7\e[m..."
 # Generate new environment and launch it with kexec
 if [[ -n "${_L_COMPLETE}" || -n "${_L_INSTALL_COMPLETE}" ]]; then
     _TITLE="Archboot $(uname -m) | Basic Setup | New Environment"
-    _new_environment | _dialog --title "${_MENU_TITLE}" --gauge "Waiting for pacman keyring..." 6 75 0
-    clear
+    _new_environment | _dialog --title "${_MENU_TITLE}" --gauge "Waiting for pacman keyring..." 6 75 0 && clear
 fi
 # Generate new images
 if [[ -n "${_G_RELEASE}" ]]; then
     _TITLE="Archboot $(uname -m) | Basic Setup | New Images"
-    _new_image | _dialog --title "${_MENU_TITLE}" --gauge "Removing not necessary files from /..." 6 75 0
-    clear
+    _new_image | _dialog --title "${_MENU_TITLE}" --gauge "Removing not necessary files from /..." 6 75 0 && clear
 fi
 # install custom xorg or wayland
 if [[ -n "${_CUSTOM_X}" || -n "${_CUSTOM_WAYLAND}" ]]; then
@@ -66,7 +64,6 @@ fi
 # Switch to full Arch Linux system
 if [[ -n "${_FULL_SYSTEM}" ]]; then
     _TITLE="Archboot $(uname -m) | Basic Setup | Full System"
-    _full_system | _dialog --title "${_MENU_TITLE}" --gauge "Syncing package db..." 6 75 0
-    clear
+    _full_system | _dialog --title "${_MENU_TITLE}" --gauge "Syncing package db..." 6 75 0  && clear
 fi
 rm /.update
diff --git a/usr/lib/archboot/update/manage.sh b/usr/lib/archboot/update/manage.sh
index 49a827fc8..e8023f92b 100644
--- a/usr/lib/archboot/update/manage.sh
+++ b/usr/lib/archboot/update/manage.sh
@@ -66,6 +66,7 @@ _update_installer_check() {
     if ! [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
         _network_check
     fi
+    exit 1
 }
 
 _gpg_check() {
@@ -286,7 +287,7 @@ _full_system() {
     if [[ -e "/.full_system" ]]; then
         clear
         echo -e "\e[1mFull Arch Linux system already setup.\e[m"
-        exit 0
+        exit 1
     fi
     _progress "1" "${_KEEP} Refreshing pacman package database..."
     pacman -Sy >"${_LOG}" 2>&1 || exit 1