mirror of
https://github.com/eworm-de/routeros-scripts.git
synced 2026-04-18 19:19:36 +00:00
Compare commits
48 commits
b167a2daed
...
4db0a0d4f0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4db0a0d4f0 | ||
|
|
5b5e3d47b6 | ||
|
|
828c93bd66 | ||
|
|
0576fbc532 | ||
|
|
9d94d69677 | ||
|
|
3e404027f6 | ||
|
|
de9e726661 | ||
|
|
68c38df755 | ||
|
|
6209f52962 | ||
|
|
616e9f244a | ||
|
|
02531d5fae | ||
|
|
bd700b8e75 | ||
|
|
1a782018bb | ||
|
|
fee409f0ba | ||
|
|
7e58ee3fdb | ||
|
|
37b417369e | ||
|
|
70b10dd2a6 | ||
|
|
a6f9e6c6be | ||
|
|
e138cd0ab9 | ||
|
|
fc1cde98f2 | ||
|
|
9cd4ed08a4 | ||
|
|
9ae21c00bd | ||
|
|
314e68e4cd | ||
|
|
e01873301f | ||
|
|
3f092d3477 | ||
|
|
2a7fd7ea53 | ||
|
|
5badafe109 | ||
|
|
c1e6348bb9 | ||
|
|
d5f9ecebfb | ||
|
|
5c599beae1 | ||
|
|
8b1b73c936 | ||
|
|
f5c4378676 | ||
|
|
12926b7c42 | ||
|
|
2317013121 | ||
|
|
86a8919ed2 | ||
|
|
09f9826760 | ||
|
|
7a1fef78a2 | ||
|
|
a6b36dde7b | ||
|
|
5b89f3e425 | ||
|
|
a9e7bb0a05 | ||
|
|
b807fc9e90 | ||
|
|
142b0760b0 | ||
|
|
79f681b801 | ||
|
|
1925d2847c | ||
|
|
187aeba78b | ||
|
|
dc2296d500 | ||
|
|
c3fce37066 | ||
|
|
6691e2e765 |
2 changed files with 14 additions and 17 deletions
|
|
@ -35,12 +35,12 @@
|
|||
:onerror Err {
|
||||
/partitions/copy-to $FallbackTo;
|
||||
$LogPrint info $ScriptName ("Copied RouterOS to partition '" . $FallbackToName . "'.");
|
||||
:return true;
|
||||
} do={
|
||||
$LogPrint error $ScriptName ("Failed copying RouterOS to partition '" . \
|
||||
$FallbackToName . "': " . $Err);
|
||||
:return false;
|
||||
}
|
||||
:return true;
|
||||
}
|
||||
|
||||
:if ([ $ScriptLock $ScriptName ] = false) do={
|
||||
|
|
|
|||
|
|
@ -391,25 +391,22 @@
|
|||
:local Url ("https://upgrade.mikrotik.com/routeros/" . $PkgVer . "/" . $PkgFile);
|
||||
$LogPrint info $0 ("Downloading package file '" . $PkgName . "'...");
|
||||
$LogPrint debug $0 ("... from url: " . $Url);
|
||||
:local Retry 3;
|
||||
:while ($Retry > 0) do={
|
||||
:onerror Err {
|
||||
/tool/fetch check-certificate=yes-without-crl $Url dst-path=$PkgDest;
|
||||
$WaitForFile $PkgDest;
|
||||
|
||||
:if ([ /file/get [ find where name=$PkgDest ] type ] = "package") do={
|
||||
:return true;
|
||||
}
|
||||
} do={
|
||||
$LogPrint debug $0 ("Downloading package file failed: " . $Err);
|
||||
}
|
||||
|
||||
$RmFile $PkgDest;
|
||||
:set Retry ($Retry - 1);
|
||||
:onerror Err {
|
||||
/tool/fetch check-certificate=yes-without-crl $Url dst-path=$PkgDest;
|
||||
$WaitForFile $PkgDest;
|
||||
} do={
|
||||
$LogPrint warning $0 ("Downloading package file '" . $PkgName . "' failed: " . $Err);
|
||||
:return false;
|
||||
}
|
||||
|
||||
$LogPrint warning $0 ("Downloading package file '" . $PkgName . "' failed.");
|
||||
:return false;
|
||||
:if ([ /file/get [ find where name=$PkgDest ] type ] != "package") do={
|
||||
$LogPrint warning $0 ("Downloaded file is not a package, removing.");
|
||||
$RmFile $PkgDest;
|
||||
:return false;
|
||||
}
|
||||
|
||||
:return true;
|
||||
}
|
||||
|
||||
# return either first (if "true") or second
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue