mirror of
https://github.com/eworm-de/routeros-scripts
synced 2024-05-14 08:04:19 +00:00
firmware-upgrade-reboot: drop main function, use :do with on-error
This commit is contained in:
parent
ef5972e9f0
commit
894c36fc15
|
@ -11,26 +11,26 @@
|
||||||
:global GlobalFunctionsReady;
|
:global GlobalFunctionsReady;
|
||||||
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
|
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
|
||||||
|
|
||||||
:local Main do={
|
:do {
|
||||||
:local ScriptName [ :tostr $1 ];
|
:local ScriptName [ :jobname ];
|
||||||
|
|
||||||
:global LogPrintExit2;
|
:global LogPrintExit2;
|
||||||
:global ScriptLock;
|
:global ScriptLock;
|
||||||
:global VersionToNum;
|
:global VersionToNum;
|
||||||
|
|
||||||
:if ([ $ScriptLock $ScriptName ] = false) do={
|
:if ([ $ScriptLock $ScriptName ] = false) do={
|
||||||
:return false;
|
:error false;
|
||||||
}
|
}
|
||||||
|
|
||||||
:local RouterBoard [ /system/routerboard/get ];
|
:local RouterBoard [ /system/routerboard/get ];
|
||||||
:if ($RouterBoard->"current-firmware" = $RouterBoard->"upgrade-firmware") do={
|
:if ($RouterBoard->"current-firmware" = $RouterBoard->"upgrade-firmware") do={
|
||||||
$LogPrintExit2 info $ScriptName ("Current and upgrade firmware match with version " . \
|
$LogPrintExit2 info $ScriptName ("Current and upgrade firmware match with version " . \
|
||||||
$RouterBoard->"current-firmware" . ".") false;
|
$RouterBoard->"current-firmware" . ".") false;
|
||||||
:return true;
|
:error true;
|
||||||
}
|
}
|
||||||
:if ([ $VersionToNum ($RouterBoard->"current-firmware") ] > [ $VersionToNum ($RouterBoard->"upgrade-firmware") ]) do={
|
:if ([ $VersionToNum ($RouterBoard->"current-firmware") ] > [ $VersionToNum ($RouterBoard->"upgrade-firmware") ]) do={
|
||||||
$LogPrintExit2 info $ScriptName ("Different firmware version is available, but it is a downgrade. Ignoring.") false;
|
$LogPrintExit2 info $ScriptName ("Different firmware version is available, but it is a downgrade. Ignoring.") false;
|
||||||
:return true;
|
:error true;
|
||||||
}
|
}
|
||||||
|
|
||||||
:if ([ /system/routerboard/settings/get auto-upgrade ] = false) do={
|
:if ([ /system/routerboard/settings/get auto-upgrade ] = false) do={
|
||||||
|
@ -51,6 +51,4 @@
|
||||||
|
|
||||||
$LogPrintExit2 info $ScriptName ("Firmware upgrade successful, rebooting.") false;
|
$LogPrintExit2 info $ScriptName ("Firmware upgrade successful, rebooting.") false;
|
||||||
/system/reboot;
|
/system/reboot;
|
||||||
}
|
} on-error={ }
|
||||||
|
|
||||||
$Main [ :jobname ];
|
|
||||||
|
|
Loading…
Reference in a new issue