From e40da1e7e483a07592477ef82c4a665f6b2a7bde Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 8 Mar 2024 12:45:37 +0100
Subject: capsman-download-packages: switch to $LogPrint

---
 capsman-download-packages.template.rsc | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'capsman-download-packages.template.rsc')

diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index cd4a83b..cad3bcb 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -20,7 +20,7 @@
 
   :global CleanFilePath;
   :global DownloadPackage;
-  :global LogPrintExit2;
+  :global LogPrint;
   :global MkDir;
   :global ScriptLock;
   :global WaitFullyConnected;
@@ -36,16 +36,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 \
@@ -62,7 +64,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.");
 # NOT /interface/wifi/ #
     :foreach Arch in={ "arm"; "mipsbe" } do={
       :foreach Package in={ "routeros"; "wireless" } do={
-- 
cgit v1.2.3-54-g00ecf