Skip to content
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

Jump to bottom

Disable Email Notifications for Available Updates from Node #191

Merged
merged 2 commits into from
Apr 14, 2024
Merged

Disable Email Notifications for Available Updates from Node #191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00e1391
Update MerlinAU.sh
ExtremeFiretop Apr 14, 2024
2159abb
Update MerlinAU.sh
ExtremeFiretop Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
###################################################################
set -u

readonly SCRIPT_VERSION=1.1.0
readonly SCRIPT_VERSION=1.1.1
readonly SCRIPT_NAME="MerlinAU"

##-------------------------------------##
Expand Down Expand Up @@ -3008,7 +3008,7 @@ _Set_FW_UpdateCronSchedule_()
}

##------------------------------------------##
## Modified by ExtremeFiretop [2024-Jan-26] ##
## Modified by ExtremeFiretop [2024-Apr-13] ##
##------------------------------------------##
_CheckNewUpdateFirmwareNotification_()
{
Expand Down Expand Up @@ -3043,7 +3043,10 @@ _CheckNewUpdateFirmwareNotification_()
fwNewUpdateNotificationDate="$(date +"$FW_UpdateNotificationDateFormat")"
Update_Custom_Settings FW_New_Update_Notification_Vers "$fwNewUpdateNotificationVers"
Update_Custom_Settings FW_New_Update_Notification_Date "$fwNewUpdateNotificationDate"
_SendEMailNotification_ NEW_FW_UPDATE_STATUS
if "$inRouterSWmode"
then
_SendEMailNotification_ NEW_FW_UPDATE_STATUS
fi
fi
fi

Expand All @@ -3052,7 +3055,10 @@ _CheckNewUpdateFirmwareNotification_()
then
fwNewUpdateNotificationDate="$(date +"$FW_UpdateNotificationDateFormat")"
Update_Custom_Settings FW_New_Update_Notification_Date "$fwNewUpdateNotificationDate"
_SendEMailNotification_ NEW_FW_UPDATE_STATUS
if "$inRouterSWmode"
then
_SendEMailNotification_ NEW_FW_UPDATE_STATUS
fi
fi
return 0
}
Expand Down