mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-06-21 01:15:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-functions: $DownloadPackage: reverse failure logic...

Browse source 
... and do not retry.
This commit is contained in:
Christian Hesse 2025-05-21 21:51:16 +02:00
parent 01f3cb91e7
commit 6691e2e765
1 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
global-functions.rsc
View file

@ -391,25 +391,22 @@
:local Url ("https://upgrade.mikrotik.com/routeros/" . $PkgVer . "/" . $PkgFile); :local Url ("https://upgrade.mikrotik.com/routeros/" . $PkgVer . "/" . $PkgFile);
$LogPrint info $0 ("Downloading package file '" . $PkgName . "'..."); $LogPrint info $0 ("Downloading package file '" . $PkgName . "'...");
$LogPrint debug $0 ("... from url: " . $Url); $LogPrint debug $0 ("... from url: " . $Url);
:local Retry 3;
:while ($Retry > 0) do={
:do {
/tool/fetch check-certificate=yes-without-crl $Url dst-path=$PkgDest;
$WaitForFile $PkgDest;
:if ([ /file/get [ find where name=$PkgDest ] type ] = "package") do={ :do {
:return true; /tool/fetch check-certificate=yes-without-crl $Url dst-path=$PkgDest;
} $WaitForFile $PkgDest;
} on-error={ } on-error={
$LogPrint debug $0 ("Downloading package file failed."); $LogPrint warning $0 ("Downloading package file '" . $PkgName . "' failed.");
} :return false;
$RmFile $PkgDest;
:set Retry ($Retry - 1);
} }
$LogPrint warning $0 ("Downloading package file '" . $PkgName . "' failed."); :if ([ /file/get [ find where name=$PkgDest ] type ] != "package") do={
:return false; $LogPrint warning $0 ("Downloaded file is not a package, removing.");
$RmFile $PkgDest;
:return false;
}
:return true;
} }
# return either first (if "true") or second # return either first (if "true") or second