Skip to content

Update MerlinAU.sh ROG Logic #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ExtremeFiretop merged 1 commit into from
Dec 24, 2023
Merged

Update MerlinAU.sh ROG Logic #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 35 additions & 28 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2023-Dec-23
# Last Modified: 2023-Dec-24
###################################################################
set -u

readonly SCRIPT_VERSION="0.2.39"
readonly SCRIPT_VERSION="0.2.40"
readonly SCRIPT_NAME="MerlinAU"

##-------------------------------------##
Expand Down Expand Up @@ -1811,7 +1811,7 @@ _RunFirmwareUpdateNow_()
fi

##---------------------------------------##
## Added by ExtremeFiretop [2023-Dec-17] ##
## Added by ExtremeFiretop [2023-Dec-24] ##
##---------------------------------------##
availableRAM_kb=$(_GetAvailableRAM_KB_)
Say "Required RAM: ${required_space_kb} KB - Available RAM: ${availableRAM_kb} KB"
Expand Down Expand Up @@ -1855,41 +1855,48 @@ _RunFirmwareUpdateNow_()
return 1
fi

# Use Get_Custom_Setting to retrieve the previous choice
previous_choice="$(Get_Custom_Setting "ROGBuild" "n")"

# Navigate to the firmware directory
cd "$FW_BIN_DIR"

# Detect ROG and pure firmware files
rog_file="$(ls | grep -i '_rog_')"
pure_file="$(ls -1 | grep -iE '.*[.](w|pkgtb|trx)$' | grep -iv 'rog')"

# Fetch the previous choice from the settings file
previous_choice="$(Get_Custom_Setting "ROGBuild")"

# Check if a ROG build is present
if [ -n "$rog_file" ]; then
# If in interactive mode, prompt the user for their choice
if [ "$inMenuMode" = true ]; then
printf "${REDct}Found ROG build: $rog_file.
Would you like to use the ROG build? (y/n)${NOct}\n"
read -rp "Enter your choice: " choice
if [ "$choice" = "y" ] || [ "$choice" = "Y" ]; then
firmware_file="$rog_file"
Update_Custom_Settings "ROGBuild" "y"
else
firmware_file="$pure_file"
Update_Custom_Settings "ROGBuild" "n"
fi
else
# Use previous choice or default to Pure Build in non-interactive mode
if [ "$previous_choice" = "y" ]; then
firmware_file="$rog_file"
else
firmware_file="$pure_file"
fi
fi
# Use the previous choice if it exists and valid, else prompt the user for their choice in interactive mode
if [ "$previous_choice" = "y" ]; then
Say "ROG Build selected for flashing"
firmware_file="$rog_file"
elif [ "$previous_choice" = "n" ]; then
Say "Pure Build selected for flashing"
firmware_file="$pure_file"
elif [ "$inMenuMode" = true ]; then
printf "\n ${REDct}Found ROG build: $rog_file.${NOct}"
printf "\n ${REDct}Would you like to use the ROG build?${NOct}\n"
printf "\n[${theExitStr}] Enter your choice (y/n): "
read -r choice
if [ "$choice" = "y" ] || [ "$choice" = "Y" ]; then
Say "ROG Build selected for flashing"
firmware_file="$rog_file"
Update_Custom_Settings "ROGBuild" "y"
else
Say "Pure Build selected for flashing"
firmware_file="$pure_file"
Update_Custom_Settings "ROGBuild" "n"
fi
else
# Default to pure_file in non-interactive mode if no previous choice
Say "Pure Build selected for flashing"
firmware_file="$pure_file"
fi
else
# No ROG build found, use the pure build
firmware_file="$pure_file"
# No ROG build found, use the pure build
Say "No ROG Build detected. Skipping."
firmware_file="$pure_file"
fi

if [ -f "sha256sum.sha256" ] && [ -f "$firmware_file" ]; then
Expand Down