mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-08-01 16:54:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-functions: $ScriptInstallUpdate: use $EitherOr

Browse source
This commit is contained in:
Christian Hesse 2023-10-13 17:35:30 +02:00
parent 2ab3468700
commit 286e3d9cf9
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
global-functions.rsc
View file

@ -890,10 +890,8 @@
:if (!($ScriptInfo->"ignore" = true)) do={
:do {
:local BaseUrl $ScriptUpdatesBaseUrl;
:local UrlSuffix $ScriptUpdatesUrlSuffix;
:if ([ :typeof ($ScriptInfo->"base-url") ] = "str") do={ :set BaseUrl ($ScriptInfo->"base-url"); }
:if ([ :typeof ($ScriptInfo->"url-suffix") ] = "str") do={ :set UrlSuffix ($ScriptInfo->"url-suffix"); }
:local BaseUrl [ $EitherOr ($ScriptInfo->"base-url") $ScriptUpdatesBaseUrl ];
:local UrlSuffix [ $EitherOr ($ScriptInfo->"url-suffix") $ScriptUpdatesUrlSuffix ];
:local Url ($BaseUrl . $ScriptVal->"name" . ".rsc" . $UrlSuffix);
$LogPrintExit2 debug $0 ("Fetching script '" . $ScriptVal->"name" . "' from url: " . $Url) false;
:local Result [ /tool/fetch check-certificate=yes-without-crl \