mirror.MikroTik/beeyev.Mikrotik-RouterOS-automatic-backup-and-update
1
0
Fork 0
mirror of https://github.com/beeyev/Mikrotik-RouterOS-automatic-backup-and-update.git synced 2025-07-15 08:24:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor email subject and body assembly for improved readability; streamline error handling in update process

Browse source
This commit is contained in:
Alexander Tebiev 2025-04-11 13:05:38 +02:00
parent be3aa8fd11
commit c799ca0837
1 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

49
v3.rsc
View file

@ -625,25 +625,16 @@
:local mailStep1Body "" :local mailStep1Body ""
# Assemble email subject # Assemble email subject
:if ($mailSubjectPartAction != "") do={ :if ($mailSubjectPartAction != "") do={:set mailStep1Subject ($mailStep1Subject . " - " . $mailSubjectPartAction)}
:set mailStep1Subject ($mailStep1Subject . " - " . $mailSubjectPartAction) :if ($mailPtSubjectBackup != "") do={:set mailStep1Subject ($mailStep1Subject . " - " . $mailPtSubjectBackup)}
}
:if ($mailPtSubjectBackup != "") do={
:set mailStep1Subject ($mailStep1Subject . " - " . $mailPtSubjectBackup)
}
# Assemble email body # Assemble email body
:if ($mailPtBodyAction != "") do={ :if ($mailPtBodyAction != "") do={:set mailStep1Body ($mailStep1Body . $mailPtBodyAction . "\n\n")}
:set mailStep1Body ($mailStep1Body . $mailPtBodyAction . "\n\n") :if ($mailPtBodyBackup != "") do={:set mailStep1Body ($mailStep1Body . $mailPtBodyBackup . "\n\n")}
}
:if ($mailPtBodyBackup != "") do={
:set mailStep1Body ($mailStep1Body . $mailPtBodyBackup . "\n\n")
}
:set mailStep1Body ($mailStep1Body . $mailBodyDeviceInfo . "\n\n" . $mailBodyCopyright) :set mailStep1Body ($mailStep1Body . $mailBodyDeviceInfo . "\n\n" . $mailBodyCopyright)
# Send email with backup files attached # Send email with backup files attached
:do { :do {$FuncSendEmailSafe $emailAddress $mailStep1Subject $mailStep1Body $mailAttachments} on-error={
$FuncSendEmailSafe $emailAddress $mailStep1Subject $mailStep1Body $mailAttachments
} on-error={
:set isOsNeedsToBeUpdated false :set isOsNeedsToBeUpdated false
:log error "$SMP The script will not proceed with the update process, because the email was not sent." :log error "$SMP The script will not proceed with the update process, because the email was not sent."
#:error $exitErrorMessage #:error $exitErrorMessage
@ -659,8 +650,29 @@
:if ($isOsNeedsToBeUpdated = true) do={ :if ($isOsNeedsToBeUpdated = true) do={
:log info "$SMP everything is ready to install new RouterOS, going to start the update process and reboot the device." :log info "$SMP everything is ready to install new RouterOS, going to start the update process and reboot the device."
:do { :do {
/system package update install :local nextStep 2
:if ($isCloudHostedRouter = true) do={
:log info "$SMP The device is a cloud hosted router, the second step updating the Routerboard firmware will be skipped."
:set nextStep 3
}
:local scheduledCommand (":delay 5s; /system scheduler remove BKPUPD-NEXT-BOOT-TASK; :global buGlobalVarScriptStep $nextStep; :global buGlobalVarTargetOsVersion \"$routerOsVersionAvailable\"; :delay 10s; /system script run BackupAndUpdate;")
/system scheduler add name=BKPUPD-NEXT-BOOT-TASK on-event=$scheduledCommand start-time=startup interval=0
#/system package update install
/system reboot
# :if ($isCloudHostedRouter = false) do={
# /system scheduler add name=BKPUPD-UPGRADE-ON-NEXT-BOOT on-event=":delay 5s; /system scheduler remove BKPUPD-UPGRADE-ON-NEXT-BOOT; :global buGlobalVarScriptStep 2; :delay 10s; /system script run BackupAndUpdate;" start-time=startup interval=0;
# } else= {
# :log info "$SMP The device is a cloud hosted router, the second step updating the Routerboard firmware will be skipped."
# /system scheduler add name=BKPUPD-UPGRADE-ON-NEXT-BOOT on-event=":delay 5s; /system scheduler remove BKPUPD-UPGRADE-ON-NEXT-BOOT; :global buGlobalVarScriptStep 3; :delay 10s; /system script run BackupAndUpdate;" start-time=startup interval=0;
# }
} on-error={ } on-error={
# Failed to install new RouterOS version, remove the scheduled task
:do {/system scheduler remove BKPUPD-NEXT-BOOT-TASK} on-error={}
:log error "$SMP Failed to install new RouterOS version. Please check device logs for more details." :log error "$SMP Failed to install new RouterOS version. Please check device logs for more details."
:local mailUpdateErrorSubject ($mailSubjectPrefix . " - Update failed") :local mailUpdateErrorSubject ($mailSubjectPrefix . " - Update failed")
@ -674,6 +686,11 @@
} }
} }
:if ($scriptStep = 2) do={
:log info "$SMP The script is in the second step, updating Routerboard firmware."
}
# Remove functions from global environment to keep it fresh and clean. # Remove functions from global environment to keep it fresh and clean.
# :do {/system script environment remove FuncIsPatchUpdateOnly} on-error={} # :do {/system script environment remove FuncIsPatchUpdateOnly} on-error={}
# :do {/system script environment remove FuncCreateBackups} on-error={} # :do {/system script environment remove FuncCreateBackups} on-error={}