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.

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

Various Small Fixes #355

Merged
merged 33 commits into from
Nov 18, 2024
Merged
Changes from 8 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
123831f
Update MerlinAU.sh
ExtremeFiretop Nov 14, 2024
2f802be
Update MerlinAU.sh
ExtremeFiretop Nov 14, 2024
f5049c6
Update MerlinAU.sh
ExtremeFiretop Nov 14, 2024
f9b5cf6
Update MerlinAU.sh
ExtremeFiretop Nov 14, 2024
37ef83a
Update MerlinAU.sh
ExtremeFiretop Nov 14, 2024
f055bd9
Update MerlinAU.sh
ExtremeFiretop Nov 14, 2024
92c35ee
Update MerlinAU.sh
ExtremeFiretop Nov 14, 2024
eb83d07
Update MerlinAU.sh
ExtremeFiretop Nov 14, 2024
9a67caf
Update MerlinAU.sh
ExtremeFiretop Nov 14, 2024
cf6d0dc
Update MerlinAU.sh
ExtremeFiretop Nov 15, 2024
c3175e7
Update MerlinAU.sh
ExtremeFiretop Nov 15, 2024
e0066a9
Update MerlinAU.sh
ExtremeFiretop Nov 15, 2024
2a43597
Update MerlinAU.sh
ExtremeFiretop Nov 15, 2024
6c11b40
Update MerlinAU.sh
ExtremeFiretop Nov 15, 2024
7cc01f5
Update MerlinAU.sh
ExtremeFiretop Nov 15, 2024
def0867
Update MerlinAU.sh
ExtremeFiretop Nov 15, 2024
c1fccae
Update MerlinAU.sh
ExtremeFiretop Nov 15, 2024
862f78c
Update MerlinAU.sh
ExtremeFiretop Nov 15, 2024
d9d1d55
Update MerlinAU.sh
ExtremeFiretop Nov 16, 2024
777f462
Update MerlinAU.sh
ExtremeFiretop Nov 16, 2024
7cbee1c
Merge branch 'dev' into ExtremeFiretop-PostUpdateEmailFix
ExtremeFiretop Nov 16, 2024
1ee9510
Update MerlinAU.sh
ExtremeFiretop Nov 16, 2024
6518e67
Update MerlinAU.sh
ExtremeFiretop Nov 16, 2024
543f26f
Update MerlinAU.sh
ExtremeFiretop Nov 16, 2024
438c128
Update MerlinAU.sh
ExtremeFiretop Nov 16, 2024
f8f0cd9
Update MerlinAU.sh
ExtremeFiretop Nov 16, 2024
b58d525
Update MerlinAU.sh
ExtremeFiretop Nov 16, 2024
23fe688
Update MerlinAU.sh
ExtremeFiretop Nov 17, 2024
42fdc44
Update MerlinAU.sh
ExtremeFiretop Nov 17, 2024
0914b1b
Update MerlinAU.sh
ExtremeFiretop Nov 17, 2024
e0a72f0
Update MerlinAU.sh
ExtremeFiretop Nov 17, 2024
5b3da64
Update MerlinAU.sh
ExtremeFiretop Nov 17, 2024
684665e
Update MerlinAU.sh
ExtremeFiretop Nov 18, 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
13 changes: 8 additions & 5 deletions MerlinAU.sh
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: 2024-Nov-13
# Last Modified: 2024-Nov-14
###################################################################
set -u

Expand Down Expand Up @@ -4262,7 +4262,7 @@ _Calculate_NextRunTime_()
}

##----------------------------------------------##
## Added/Modified by Martinski W. [2023-Nov-19] ##
## Modified by ExtremeFiretop [2024-Nov-14] ##
##----------------------------------------------##
_AddCronJobEntry_()
{
Expand All @@ -4288,6 +4288,7 @@ _AddCronJobEntry_()
"$newSetting" && \
Update_Custom_Settings FW_New_Update_Cron_Job_Schedule "$newSchedule"
fi
_ReleaseLock_
ExtremeFiretop marked this conversation as resolved.
Show resolved Hide resolved
return "$retCode"
}

Expand Down Expand Up @@ -6250,6 +6251,7 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or
##-------------------------------------##
# Remove cron jobs from 3rd-party Add-Ons #
_RemoveCronJobsFromAddOns_
_DelCronJobRunScriptHook_
ExtremeFiretop marked this conversation as resolved.
Show resolved Hide resolved

_SendEMailNotification_ POST_REBOOT_FW_UPDATE_SETUP
echo
Expand Down Expand Up @@ -6351,12 +6353,13 @@ _WAN_IsConnected_()
return "$retCode"
}

##----------------------------------------##
## Modified by Martinski W. [2024-Nov-13] ##
##----------------------------------------##
##------------------------------------------##
## Modified by ExtremeFiretop [2024-Nov-14] ##
##------------------------------------------##
_PostUpdateEmailNotification_()
{
_DelPostUpdateEmailNotifyScriptHook_
_AddCronJobRunScriptHook_
Update_Custom_Settings FW_New_Update_Changelog_Approval TBD

local theWaitDelaySecs=10
Expand Down