Skip to content

Minor UI Improvement #377

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
Martinski4GitHub merged 2 commits into from
Dec 31, 2024
Merged

Minor UI Improvement #377

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f2f0e7
Update MerlinAU.sh
ExtremeFiretop Dec 30, 2024
9c5f9c9
Update MerlinAU.sh
ExtremeFiretop Dec 31, 2024
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
6 changes: 3 additions & 3 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,8 +1686,8 @@ _CreateEMailContent_()
fwNewUpdateVersion="$(Get_Custom_Setting "FW_New_Update_Notification_Vers")"
fi

#Remove any suffix starting with "-" or "_" to avoid version comparison failures#
fwInstalledVersion="$(echo "$fwInstalledVersion" | sed -E 's/[-_].*$//')"
# Remove "_rog" or "_tuf" or -gHASHVALUES or -Gnuton* suffix to avoid version comparison failure, can't remove all for proper beta and alpha comparison #
fwInstalledVersion="$(echo "$fwInstalledVersion" | sed -E 's/(_(rog|tuf)|-g[0-9a-f]{10}|-gnuton[0-9]+)$//')"

case "$1" in
FW_UPDATE_TEST_EMAIL)
Expand Down Expand Up @@ -8722,7 +8722,7 @@ _ShowAdvancedOptionsMenu_()
fi
if "$sendEMailNotificationsFlag"
then
printf "\n${padStr}[Currently ${GRNct}ENABLED${NOct}, Format: ${GRNct}${sendEMailFormaType}${NOct}]\n"
printf "\n${padStr}[Currently ${GRNct}ENABLED${NOct}]\n"
else
printf "\n${padStr}[Currently ${REDct}DISABLED${NOct}]\n"
fi
Expand Down
Loading