mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-06-26 19:48:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

capsman-download-packages: drop main function, use :do with on-error

Browse source
This commit is contained in:
Christian Hesse 2024-03-06 15:28:55 +01:00
parent 8d020a4de8
commit 03309d4fdb
3 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
capsman-download-packages.capsman.rsc
View file

@ -14,8 +14,8 @@
: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 CleanFilePath; :global CleanFilePath;
:global DownloadPackage; :global DownloadPackage;
@ -25,7 +25,7 @@
:global WaitFullyConnected; :global WaitFullyConnected;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
$WaitFullyConnected; $WaitFullyConnected;
@ -78,6 +78,4 @@
/caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ]; /caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ];
} }
} }
} } on-error={ }
$Main [ :jobname ];

10
capsman-download-packages.template.rsc
View file

@ -15,8 +15,8 @@
: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 CleanFilePath; :global CleanFilePath;
:global DownloadPackage; :global DownloadPackage;
@ -26,7 +26,7 @@
:global WaitFullyConnected; :global WaitFullyConnected;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
$WaitFullyConnected; $WaitFullyConnected;
@ -89,6 +89,4 @@
/interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ]; /interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
} }
} }
} } on-error={ }
$Main [ :jobname ];

10
capsman-download-packages.wifi.rsc
View file

@ -14,8 +14,8 @@
: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 CleanFilePath; :global CleanFilePath;
:global DownloadPackage; :global DownloadPackage;
@ -25,7 +25,7 @@
:global WaitFullyConnected; :global WaitFullyConnected;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
$WaitFullyConnected; $WaitFullyConnected;
@ -80,6 +80,4 @@
/interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ]; /interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
} }
} }
} } on-error={ }
$Main [ :jobname ];