aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-03-06 15:28:55 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-03-12 15:27:15 +0100
commit7110b29cbabdd7097c0eeebb338b4b5b42ce6aee (patch)
tree9f9c5b4c19a978416c20da18c186cd4b97918a70
parentb78556ca41c720f14c57eb84b85bcf099c06764c (diff)
check-routeros-update: drop main function, use :do with on-error
-rw-r--r--check-routeros-update.rsc16
1 files changed, 7 insertions, 9 deletions
diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index ae0038c..a68762b 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -11,8 +11,8 @@
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-:local Main do={
- :local ScriptName [ :tostr $1 ];
+:do {
+ :local ScriptName [ :jobname ];
:global Identity;
:global SafeUpdateAll;
@@ -42,7 +42,7 @@
}
:if ([ $ScriptLock $ScriptName ] = false) do={
- :return false;
+ :error false;
}
$WaitFullyConnected;
@@ -56,7 +56,7 @@
:if ([ $ScriptFromTerminal $ScriptName ] = true && ($Update->"installed-version") = ($Update->"latest-version")) do={
$LogPrintExit2 info $ScriptName ("System is already up to date.") false;
- :return true;
+ :error true;
}
:local NumInstalled [ $VersionToNum ($Update->"installed-version") ];
@@ -133,7 +133,7 @@
:if ($SentRouterosUpdateNotification = $Update->"latest-version") do={
$LogPrintExit2 info $ScriptName ("Already sent the RouterOS update notification for version " . \
$Update->"latest-version" . ".") false;
- :return true;
+ :error true;
}
$SendNotification2 ({ origin=$ScriptName; \
@@ -148,7 +148,7 @@
:if ($SentRouterosUpdateNotification = $Update->"latest-version") do={
$LogPrintExit2 info $ScriptName ("Already sent the RouterOS downgrade notification for version " . \
$Update->"latest-version" . ".") false;
- :return true;
+ :error true;
}
$SendNotification2 ({ origin=$ScriptName; \
@@ -160,6 +160,4 @@
" is available for downgrade.") false;
:set SentRouterosUpdateNotification ($Update->"latest-version");
}
-}
-
-$Main [ :jobname ];
+} on-error={ }