Crash_Override/routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts synced 2024-05-14 08:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

global-functions: $DownloadPackage: handle special cases

Browse source 
This is a RouterOS v7 only change!

* Revert commit 1e6931c8e3 (but keep the
  cherry-picked one in branch routeros-v6).

* Drop special case 'routeros-$arch', which no longer exists.

* Update package name 'system' to 'routeros'. This should be the correct
  name, and is expected by CAPsMAN. No idea why package-name property
  for the file is different...
This commit is contained in:
Christian Hesse 2022-02-10 12:20:24 +01:00
parent 4d26dd07c3
commit 674398b342
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
global-functions
View file

@ -252,20 +252,16 @@
:global CleanFilePath;
:global LogPrintExit2;
:global MkDir;
:global VersionToNum;
:global WaitForFile;
:if ([ :len $PkgName ] = 0) do={ :return false; }
:if ([ :len $PkgVer ] = 0) do={ :set PkgVer [ / system package update get installed-version ]; }
:if ([ :len $PkgArch ] = 0) do={ :set PkgArch [ / system resource get architecture-name ]; }
:if ($PkgName = "system") do={ :set PkgName "routeros"; }
:local PkgFile ($PkgName . "-" . $PkgVer . "-" . $PkgArch . ".npk");
:if ([ $VersionToNum $PkgVer ] < [ $VersionToNum "7.0" ] && $PkgName = "routeros") do={
:set PkgFile ($PkgName . "-" . $PkgArch . "-" . $PkgVer . ".npk");
}
:if ($PkgArch = "x86_64" || $PkgName ~ "^routeros-") do={
:set PkgFile ($PkgName . "-" . $PkgVer . ".npk");
}
:if ($PkgArch = "x86_64") do={ :set PkgFile ($PkgName . "-" . $PkgVer . ".npk"); }
:local PkgDest [ $CleanFilePath ($PkgDir . "/" . $PkgFile) ];
:if ([ $MkDir $PkgDir ] = false) do={