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

packages-update: use $ExitError to indicate unintentional error

Browse source
This commit is contained in:
Christian Hesse 2024-12-06 10:31:52 +01:00
parent eeb76c227c
commit 81f59f9894
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
packages-update.rsc
View file

@ -11,6 +11,7 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local ExitOK false;
:do { :do {
:local ScriptName [ :jobname ]; :local ScriptName [ :jobname ];
@ -45,6 +46,7 @@
} }
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:set ExitOK true;
:error false; :error false;
} }
@ -52,11 +54,13 @@
:if ([ :typeof ($Update->"latest-version") ] = "nothing") do={ :if ([ :typeof ($Update->"latest-version") ] = "nothing") do={
$LogPrint warning $ScriptName ("Latest version is not known."); $LogPrint warning $ScriptName ("Latest version is not known.");
:set ExitOK true;
:error false; :error false;
} }
:if ($Update->"installed-version" = $Update->"latest-version") do={ :if ($Update->"installed-version" = $Update->"latest-version") do={
$LogPrint info $ScriptName ("Version " . $Update->"latest-version" . " is already installed."); $LogPrint info $ScriptName ("Version " . $Update->"latest-version" . " is already installed.");
:set ExitOK true;
:error true; :error true;
} }
@ -85,10 +89,12 @@
$LogPrint info $ScriptName ("User requested to continue anyway."); $LogPrint info $ScriptName ("User requested to continue anyway.");
} else={ } else={
$LogPrint info $ScriptName ("Canceled update..."); $LogPrint info $ScriptName ("Canceled update...");
:set ExitOK true;
:error false; :error false;
} }
} else={ } else={
$LogPrint warning $ScriptName ("Canceled non-interactive update."); $LogPrint warning $ScriptName ("Canceled non-interactive update.");
:set ExitOK true;
:error false; :error false;
} }
} }
@ -108,6 +114,7 @@
} }
} else={ } else={
$LogPrint warning $ScriptName ("Not installing downgrade automatically."); $LogPrint warning $ScriptName ("Not installing downgrade automatically.");
:set ExitOK true;
:error false; :error false;
} }
} }
@ -116,6 +123,7 @@
:local PkgName [ /system/package/get $Package name ]; :local PkgName [ /system/package/get $Package name ];
:if ([ $DownloadPackage $PkgName ($Update->"latest-version") ] = false) do={ :if ([ $DownloadPackage $PkgName ($Update->"latest-version") ] = false) do={
$LogPrint error $ScriptName ("Download for package " . $PkgName . " failed, update aborted."); $LogPrint error $ScriptName ("Download for package " . $PkgName . " failed, update aborted.");
:set ExitOK true;
:error false; :error false;
} }
} }
@ -130,11 +138,13 @@
:put "Do you want to (s)chedule reboot or (r)eboot now? [s/R]"; :put "Do you want to (s)chedule reboot or (r)eboot now? [s/R]";
:if (([ /terminal/inkey timeout=60 ] % 32) = 19) do={ :if (([ /terminal/inkey timeout=60 ] % 32) = 19) do={
$Schedule $ScriptName; $Schedule $ScriptName;
:set ExitOK true;
:error true; :error true;
} }
} else={ } else={
:if ($PackagesUpdateDeferReboot = true) do={ :if ($PackagesUpdateDeferReboot = true) do={
$Schedule $ScriptName; $Schedule $ScriptName;
:set ExitOK true;
:error true; :error true;
} }
} }
@ -142,4 +152,6 @@
$LogPrint info $ScriptName ("Rebooting for update."); $LogPrint info $ScriptName ("Rebooting for update.");
:delay 1s; :delay 1s;
/system/reboot; /system/reboot;
} on-error={ } } on-error={
:global ExitError; $ExitError $ExitOK [ :jobname ];
}