Skip to content

Commit

Permalink
Use curl by default
Browse files Browse the repository at this point in the history
- introduce FRZR_INSTALLER to flag for the presence of the GUI installer
- use curl by default if frzr deploy is used by CLI
  • Loading branch information
NeroReflex committed Aug 13, 2024
1 parent 0337925 commit 707b00c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions __frzr
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion __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 [ "${SHOW_UI}" = "0" ]; 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"
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions __frzr-envars
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 707b00c

Please sign in to comment.