Skip to content

Fix Changelog and Email Notifications and Patch Uninstall #453

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 3 commits into from
Apr 11, 2025
Merged

Fix Changelog and Email Notifications and Patch Uninstall #453

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46d4f90
Patch Changelog and Email Notifications
ExtremeFiretop Apr 11, 2025
789254e
Update MerlinAU.sh
ExtremeFiretop Apr 11, 2025
ab43a44
Update MerlinAU.sh
ExtremeFiretop Apr 11, 2025
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
90 changes: 51 additions & 39 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2025-Apr-09
# Last Modified: 2025-Apr-11
###################################################################
set -u

Expand Down Expand Up @@ -7196,9 +7196,9 @@ _Toggle_ScriptAutoUpdate_Config_()
return "$retCode"
}

##----------------------------------------##
## Modified by Martinski W. [2024-May-31] ##
##----------------------------------------##
##------------------------------------------##
## Modified by ExtremeFiretop [2025-Apr-11] ##
##------------------------------------------##
_high_risk_phrases_interactive_()
{
local changelog_contents="$1"
Expand Down Expand Up @@ -7232,9 +7232,8 @@ _high_risk_phrases_interactive_()
Say "*WARNING*: Found high-risk phrases in the changelog file."
Say "Please run script interactively to approve the firmware update."
Update_Custom_Settings "FW_New_Update_Changelog_Approval" "BLOCKED"
_SendEMailNotification_ STOP_FW_UPDATE_APPROVAL
_DoCleanUp_ 1
_DoExit_ 1
return 1
fi
fi
else
Expand Down Expand Up @@ -7384,9 +7383,9 @@ _ChangelogVerificationCheck_()
fi
}

##----------------------------------------##
## Modified by Martinski W. [2024-Nov-18] ##
##----------------------------------------##
##------------------------------------------##
## Modified by ExtremeFiretop [2025-Apr-11] ##
##------------------------------------------##
_ManageChangelogMerlin_()
{
if [ $# -eq 0 ] || [ -z "$1" ]
Expand Down Expand Up @@ -7447,7 +7446,16 @@ _ManageChangelogMerlin_()
else
if [ "$mode" = "download" ]
then
_ChangelogVerificationCheck_ "auto"
if ! "$FlashStarted"
then
_ChangelogVerificationCheck_ "auto"
else
if ! _ChangelogVerificationCheck_ "interactive"
then
_SendEMailNotification_ STOP_FW_UPDATE_APPROVAL
return 1
fi
fi
elif [ "$mode" = "view" ]
then
clear
Expand All @@ -7465,9 +7473,9 @@ _ManageChangelogMerlin_()
return 0
}

##----------------------------------------##
## Modified by Martinski W. [2024-Nov-18] ##
##----------------------------------------##
##------------------------------------------##
## Modified by ExtremeFiretop [2025-Apr-11] ##
##------------------------------------------##
_ManageChangelogGnuton_()
{
if [ $# -eq 0 ] || [ -z "$1" ]
Expand Down Expand Up @@ -7508,7 +7516,16 @@ _ManageChangelogGnuton_()
else
if [ "$mode" = "download" ]
then
_ChangelogVerificationCheck_ "auto"
if ! "$FlashStarted"
then
_ChangelogVerificationCheck_ "auto"
else
if ! _ChangelogVerificationCheck_ "interactive"
then
_SendEMailNotification_ STOP_FW_UPDATE_APPROVAL
return 1
fi
fi
elif [ "$mode" = "view" ]
then
clear
Expand All @@ -7525,9 +7542,9 @@ _ManageChangelogGnuton_()
return 0
}

##----------------------------------------##
## Modified by Martinski W. [2025-Jan-10] ##
##----------------------------------------##
##------------------------------------------##
## Modified by ExtremeFiretop [2025-Apr-11] ##
##------------------------------------------##
_CheckNewUpdateFirmwareNotification_()
{
if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ]
Expand Down Expand Up @@ -7570,14 +7587,11 @@ _CheckNewUpdateFirmwareNotification_()
Update_Custom_Settings FW_New_Update_Notification_Vers "$fwNewUpdateNotificationVers"
Update_Custom_Settings FW_New_Update_Notification_Date "$fwNewUpdateNotificationDate"
"$mountWebGUI_OK" && sendNewUpdateStatusEmail=true
if ! "$FlashStarted"
if "$isGNUtonFW"
then
if "$isGNUtonFW"
then
_ManageChangelogGnuton_ "download"
else
_ManageChangelogMerlin_ "download" "$fwNewUpdateNotificationVers"
fi
_ManageChangelogGnuton_ "download"
else
_ManageChangelogMerlin_ "download" "$fwNewUpdateNotificationVers"
fi
fi
fi
Expand All @@ -7588,14 +7602,11 @@ _CheckNewUpdateFirmwareNotification_()
fwNewUpdateNotificationDate="$(date +"$FW_UpdateNotificationDateFormat")"
Update_Custom_Settings FW_New_Update_Notification_Date "$fwNewUpdateNotificationDate"
"$mountWebGUI_OK" && sendNewUpdateStatusEmail=true
if ! "$FlashStarted"
if "$isGNUtonFW"
then
if "$isGNUtonFW"
then
_ManageChangelogGnuton_ "download"
else
_ManageChangelogMerlin_ "download" "$fwNewUpdateNotificationVers"
fi
_ManageChangelogGnuton_ "download"
else
_ManageChangelogMerlin_ "download" "$fwNewUpdateNotificationVers"
fi
fi

Expand Down Expand Up @@ -10821,16 +10832,11 @@ _MainMenu_()
done
}

##-------------------------------------##
## Added by Martinski W. [2025-Jan-15] ##
##-------------------------------------##
##------------------------------------------##
## Modified by ExtremeFiretop [2025-Jan-15] ##
##------------------------------------------##
_DoInitializationStartup_()
{
if ! _CheckForMinimumRequirements_
then
printf "\n${CRITct}Minimum requirements for $SCRIPT_NAME were not met. See the reason(s) above.${NOct}\n"
_DoExit_ 1
fi

if [ $# -gt 0 ] && [ -n "$1" ] && \
echo "$1" | grep -qE "^(install|startup)$"
Expand All @@ -10849,6 +10855,12 @@ _DoInitializationStartup_()
_AutoServiceEvent_ create 2>/dev/null
fi

if ! _CheckForMinimumRequirements_
then
printf "\n${CRITct}Minimum requirements for $SCRIPT_NAME were not met. See the reason(s) above.${NOct}\n"
return 1
fi

_CheckAndSetBackupOption_
_SetDefaultBuildType_
}
Expand Down