From 033792516b65159bdf033c9a22bc5c12c44f45f8 Mon Sep 17 00:00:00 2001
From: Denis Benato <benato.denis96@gmail.com>
Date: Sat, 3 Aug 2024 03:31:45 +0200
Subject: [PATCH] Use whiptail by default

The default mode being suitable for the installer (not showing download progress) is not good for using frzr via terminal: use whiptail GUI by default
---
 __frzr-deploy        | 8 ++++----
 test/test-deploy.sh  | 1 +
 test/test-install.sh | 1 +
 test/test-removal.sh | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/__frzr-deploy b/__frzr-deploy
index d25652b..d467e13 100644
--- a/__frzr-deploy
+++ b/__frzr-deploy
@@ -337,7 +337,7 @@ frzr_deploy() {
 				if [ $FRZR_STEAM_PROGRESS -eq 1 ]; then
 					curl --http1.1 -# -L -o "${IMG_FILE}" -C - "${IMG_URL}" 2>&1 |
 						stdbuf -oL tr '\r' '\n' | grep --line-buffered -oP '[0-9]*+(?=.[0-9])' | clean_progress 91 %
-				elif [ -z ${SHOW_UI} ]; then
+				elif [ "${SHOW_UI}" = "0" ]; then
 					# This will need to be put under a new variable if it passes testing because we want to have different
 					# logic depending if there is a Modern UI, legecy UI support, or if it is ran via CLI
 					TASK_MSG="Downloading Image"
@@ -412,7 +412,7 @@ frzr_deploy() {
 			fi
 
 			# Use BTRFS receive to install the image
-			if [ -z ${SHOW_UI} ]; then
+			if [ "${SHOW_UI}" = "0" ]; then
 				TASK_MSG="Installing image ${NAME}"
 				send_data
 			else
@@ -572,7 +572,7 @@ frzr_deploy() {
 
 			RUNNING=false
 
-			if [ -z ${SHOW_UI} ]; then
+			if [ "${SHOW_UI}" = "0" ]; then
 				echo "Deployment is successful: reboot to boot into ${NAME}"
 			else
 				whiptail --msgbox "Deployment is successful: reboot to boot into ${NAME}" 8 48
@@ -585,7 +585,7 @@ frzr_deploy() {
 			send_data
 			RUNNING=false
 
-			if [ -z ${SHOW_UI} ]; then
+			if [ "${SHOW_UI}" = "0" ]; then
 				echo "Deployment failed: ${TASK_ERROR_MSG}"
 			else
 				whiptail --msgbox "Deployment failed: ${TASK_ERROR_MSG}" 8 48
diff --git a/test/test-deploy.sh b/test/test-deploy.sh
index 3e53edc..10692f2 100755
--- a/test/test-deploy.sh
+++ b/test/test-deploy.sh
@@ -76,6 +76,7 @@ if btrfs send $MOUNT_POINT/archlinux | xz -e -9 --memory=95% -T0 > $TARGET_FILEN
 	export SWAP_GIB=0
 	bash /workdir/frzr bootstrap
 
+	export SHOW_UI="0"
 	export SKIP_UEFI_CHECK="yes"
 	export MOUNT_PATH="/tmp/frzr_root"
 	export EFI_MOUNT_PATH="/tmp/frzr_root/efi"
diff --git a/test/test-install.sh b/test/test-install.sh
index ab61e39..170e29a 100755
--- a/test/test-install.sh
+++ b/test/test-install.sh
@@ -33,6 +33,7 @@ export DISK="$MOUNTED_DEVICE"
 export SWAP_GIB=0
 bash /workdir/frzr bootstrap
 
+export SHOW_UI="0"
 export SKIP_UEFI_CHECK="yes"
 export MOUNT_PATH="/tmp/frzr_root"
 export EFI_MOUNT_PATH="/tmp/frzr_root/efi"
diff --git a/test/test-removal.sh b/test/test-removal.sh
index 34bd4dd..c06b8c2 100755
--- a/test/test-removal.sh
+++ b/test/test-removal.sh
@@ -33,6 +33,7 @@ export DISK="$MOUNTED_DEVICE"
 export SWAP_GIB=0
 bash /workdir/frzr bootstrap
 
+export SHOW_UI="0"
 export SKIP_UEFI_CHECK="yes"
 export MOUNT_PATH="/tmp/frzr_root"
 export EFI_MOUNT_PATH="/tmp/frzr_root/efi"