aboutsummaryrefslogtreecommitdiffstats
path: root/capsman-download-packages.capsman.rsc
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-03-08 17:32:12 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-03-12 20:37:57 +0100
commitba2df80f073caf6b426def177b217d1b37954d7f (patch)
tree5dadd74e56ded840e62e82127a9315c8769bfd83 /capsman-download-packages.capsman.rsc
parent19802c0b6977f9467fada4ace3cab017dd98964b (diff)
parent242ecef012f5208b6fa088a1222d0d5477e5b2ed (diff)
Merge branch 'LogPrint' into next
Diffstat (limited to 'capsman-download-packages.capsman.rsc')
-rw-r--r--capsman-download-packages.capsman.rsc16
1 files changed, 9 insertions, 7 deletions
diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index d4e900d..a3bd4a5 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -19,7 +19,7 @@
:global CleanFilePath;
:global DownloadPackage;
- :global LogPrintExit2;
+ :global LogPrint;
:global MkDir;
:global ScriptLock;
:global WaitFullyConnected;
@@ -34,16 +34,18 @@
:local Updated false;
:if ([ :len $PackagePath ] = 0) do={
- $LogPrintExit2 warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.") true;
+ $LogPrint warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.");
+ :error false;
}
:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
:if ([ $MkDir $PackagePath ] = false) do={
- $LogPrintExit2 warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
- $PackagePath . ") failed!") true;
+ $LogPrint warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
+ $PackagePath . ") failed!");
+ :error false;
}
- $LogPrintExit2 info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
- "). Please place your packages!") false;
+ $LogPrint info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
+ "). Please place your packages!");
}
:foreach Package in=[ /file/find where type=package \
@@ -60,7 +62,7 @@
}
:if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
- $LogPrintExit2 info $ScriptName ("No packages available, downloading default set.") false;
+ $LogPrint info $ScriptName ("No packages available, downloading default set.");
:foreach Arch in={ "arm"; "mipsbe" } do={
:foreach Package in={ "routeros"; "wireless" } do={
:if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={