diff options
| author |  Christian Hesse <mail@eworm.de> | 2024-03-04 17:54:28 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2024-03-12 15:27:15 +0100 |
| commit | c462c0b5983811d8a8b66e08184b38440941ff1c (patch) | |
| tree | d798b765641787f0220ea1340327118e0d57b229 /check-routeros-update.rsc | |
| parent | d46156ad92322ffda1c7769d8eb9ea2b9fab6015 (diff) | |
| parent | ada91536366d72e1a30c186be9289fb455ab3149 (diff) | |
Merge branch 'no-error-on-exit' into nextrouteros-7.15beta4-1
Diffstat (limited to 'check-routeros-update.rsc')
| -rw-r--r-- | check-routeros-update.rsc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc index 519c2d4..ae0038c 100644 --- a/check-routeros-update.rsc +++ b/check-routeros-update.rsc @@ -41,7 +41,9 @@ :error "Waiting for system to reboot."; } - $ScriptLock $ScriptName; + :if ([ $ScriptLock $ScriptName ] = false) do={ + :return false; + } $WaitFullyConnected; :if ([ :len [ /system/scheduler/find where name="_RebootForUpdate" ] ] > 0) do={ @@ -53,7 +55,8 @@ :local Update [ /system/package/update/get ]; :if ([ $ScriptFromTerminal $ScriptName ] = true && ($Update->"installed-version") = ($Update->"latest-version")) do={ - $LogPrintExit2 info $ScriptName ("System is already up to date.") true; + $LogPrintExit2 info $ScriptName ("System is already up to date.") false; + :return true; } :local NumInstalled [ $VersionToNum ($Update->"installed-version") ]; @@ -129,7 +132,8 @@ :if ($SentRouterosUpdateNotification = $Update->"latest-version") do={ $LogPrintExit2 info $ScriptName ("Already sent the RouterOS update notification for version " . \ - $Update->"latest-version" . ".") true; + $Update->"latest-version" . ".") false; + :return true; } $SendNotification2 ({ origin=$ScriptName; \ @@ -143,7 +147,8 @@ :if ($NumInstalled > $NumLatest) do={ :if ($SentRouterosUpdateNotification = $Update->"latest-version") do={ $LogPrintExit2 info $ScriptName ("Already sent the RouterOS downgrade notification for version " . \ - $Update->"latest-version" . ".") true; + $Update->"latest-version" . ".") false; + :return true; } $SendNotification2 ({ origin=$ScriptName; \ |