mirror.MikroTik/eworm-de.routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2025-08-18 16:48:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-functions: $ScriptInstallUpdate: :do ... on-error=... -> :onerror ... do=...

Browse source
This commit is contained in:
Christian Hesse 2025-05-08 09:33:39 +02:00
parent 2317013121
commit 12926b7c42
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
global-functions.rsc
View file

@ -1201,7 +1201,7 @@
} }
} }
:do { :onerror Err {
:local BaseUrl [ $EitherOr ($ScriptInfo->"base-url") $ScriptUpdatesBaseUrl ]; :local BaseUrl [ $EitherOr ($ScriptInfo->"base-url") $ScriptUpdatesBaseUrl ];
:local UrlSuffix [ $EitherOr ($ScriptInfo->"url-suffix") $ScriptUpdatesUrlSuffix ]; :local UrlSuffix [ $EitherOr ($ScriptInfo->"url-suffix") $ScriptUpdatesUrlSuffix ];
:local Url ($BaseUrl . $ScriptVal->"name" . ".rsc" . $UrlSuffix); :local Url ($BaseUrl . $ScriptVal->"name" . ".rsc" . $UrlSuffix);
@ -1211,13 +1211,11 @@
:if ($Result->"status" = "finished") do={ :if ($Result->"status" = "finished") do={
:set SourceNew [ :tolf ($Result->"data") ]; :set SourceNew [ :tolf ($Result->"data") ];
} }
} on-error={ } do={
$LogPrint warning $0 ("Failed fetching script '" . $ScriptVal->"name" . . "': " . $Err);
:if ($ScriptVal->"source" = "#!rsc by RouterOS\n") do={ :if ($ScriptVal->"source" = "#!rsc by RouterOS\n") do={
$LogPrint warning $0 ("Failed fetching script '" . $ScriptVal->"name" . \ $LogPrint warning $0 ("Removing dummy. Typo on installation?");
"', removing dummy. Typo on installation?");
/system/script/remove $Script; /system/script/remove $Script;
} else={
$LogPrint warning $0 ("Failed fetching script '" . $ScriptVal->"name" . "'!");
} }
:error false; :error false;
} }
@ -1304,7 +1302,7 @@
:global GlobalConfigMigration; :global GlobalConfigMigration;
:local ChangeLogCode; :local ChangeLogCode;
:do { :onerror Err {
:local Url ($ScriptUpdatesBaseUrl . "news-and-changes.rsc" . $ScriptUpdatesUrlSuffix); :local Url ($ScriptUpdatesBaseUrl . "news-and-changes.rsc" . $ScriptUpdatesUrlSuffix);
$LogPrint debug $0 ("Fetching news, changes and migration: " . $Url); $LogPrint debug $0 ("Fetching news, changes and migration: " . $Url);
:local Result [ /tool/fetch check-certificate=yes-without-crl \ :local Result [ /tool/fetch check-certificate=yes-without-crl \
@ -1312,16 +1310,16 @@
:if ($Result->"status" = "finished") do={ :if ($Result->"status" = "finished") do={
:set ChangeLogCode ($Result->"data"); :set ChangeLogCode ($Result->"data");
} }
} on-error={ } do={
$LogPrint warning $0 ("Failed fetching news, changes and migration!"); $LogPrint warning $0 ("Failed fetching news, changes and migration: " . $Err);
} }
:if ([ :len $ChangeLogCode ] > 0) do={ :if ([ :len $ChangeLogCode ] > 0) do={
:if ([ $ValidateSyntax $ChangeLogCode ] = true) do={ :if ([ $ValidateSyntax $ChangeLogCode ] = true) do={
:do { :onerror Err {
[ :parse $ChangeLogCode ]; [ :parse $ChangeLogCode ];
} on-error={ } do={
$LogPrint warning $0 ("The changelog failed to run!"); $LogPrint warning $0 ("The changelog failed to run: " . $Err);
} }
} else={ } else={
$LogPrint warning $0 ("The changelog failed syntax validation!"); $LogPrint warning $0 ("The changelog failed syntax validation!");
@ -1343,10 +1341,10 @@
} }
$LogPrint info $0 ("Applying migration for change " . $I . ": " . $Migration); $LogPrint info $0 ("Applying migration for change " . $I . ": " . $Migration);
:do { :onerror Err {
[ :parse $Migration ]; [ :parse $Migration ];
} on-error={ } do={
$LogPrint warning $0 ("Migration code for change " . $I . " failed to run!"); $LogPrint warning $0 ("Migration code for change " . $I . " failed to run: " . $Err);
} }
} on-error={ } } on-error={ }
} }