Skip to content

Commit

Permalink
Use whiptail by default
Browse files Browse the repository at this point in the history
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
  • Loading branch information
NeroReflex committed Aug 3, 2024
1 parent f94f56f commit 0337925
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions __frzr-deploy
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/test-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions test/test-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions test/test-removal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 0337925

Please sign in to comment.