Merge pull request #66 from NeroReflex/download_progress_by_default

Change the downloader default GUI

__frzr

@@ -21,6 +21,7 @@ frzr_status() {
 		"Local Install": "$LOCAL_INSTALL",
 		"Repair Install": "$REPAIR_INSTALL",
 		"Show UI": "$SHOW_UI",
+		"GUI Installer": "$FRZR_INSTALLER",
 		"EFI Path": "$EFI_MOUNT_PATH",
 		"Mount Path": "$MOUNT_PATH",
 		"SUBVOL": "$SUBVOL",

__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" ] && [ "${FRZR_INSTALLER}" = "1" ]; 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"
@@ -354,6 +354,8 @@ frzr_deploy() {
 						fi;
 						sleep 1;
 					done
+				elif [ "${SHOW_UI}" = "0" ]; then
+					curl --http1.1 -L -o "${IMG_FILE}" -C - "${IMG_URL}"
 				else
 					TASK_MSG="Using Whiptail to show download progress"
 					send_data
@@ -412,7 +414,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 +574,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 +587,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

__frzr-envars

@@ -28,6 +28,10 @@ if [ -z "$EFI_MOUNT_PATH" ]; then
 	EFI_MOUNT_PATH="${MOUNT_PATH}/efi" # EFI mount path
 fi
 
+if [ -z "$FRZR_INSTALLER" ]; then
+	FRZR_INSTALLER="0"
+fi
+
 SUBVOL=""
 DEPLOY_PATH="" # ${MOUNT_PATH}/deployments
 FRZR_CHECK_UPDATE=0

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"

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"

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"