From d755b743456e74aeead3eff08b26712e786eda95 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 2 Jun 2025 21:53:23 +0200
Subject: [PATCH 01/17] global-functions: introduce $FileGet

---
 global-functions.rsc | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/global-functions.rsc b/global-functions.rsc
index 759b2744..d2cc2abc 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -38,6 +38,7 @@
 :global ExitError;
 :global FetchHuge;
 :global FetchUserAgentStr;
+:global FileGet;
 :global FormatLine;
 :global FormatMultiLines;
 :global GetMacVendor;
@@ -529,6 +530,20 @@
     $Resource->"architecture-name" . " " . $Caller . "/Fetch (https://rsc.eworm.de/)");
 }
 
+# get file properties in array, or false on error
+:set FileGet do={
+  :local FileName [ :tostr $1 ];
+
+  :local FileVal;
+  :do {
+    :set FileVal [ /file/get $FileName ];
+  } on-error={
+    :return false;
+  }
+
+  :return $FileVal;
+}
+
 # format a line for output
 :set FormatLine do={
   :local Key    [ :tostr $1 ];

From 0d84476d317337736d79193cd8e260649e8231e2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 20:42:25 +0200
Subject: [PATCH 02/17] global-functions: $MkDir: use $FileGet ...

... to work around restrictions in new file handling
---
 global-functions.rsc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index d2cc2abc..4ad3ac24 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -895,6 +895,7 @@
   :local Path [ :tostr $1 ];
 
   :global CleanFilePath;
+  :global FileGet;
   :global LogPrint;
   :global RmDir;
   :global WaitForFile;
@@ -932,7 +933,8 @@
 
   $LogPrint debug $0 ("Making directory: " . $Path);
 
-  :if ([ :len [ /file/find where name=$Path type="directory" ] ] = 1) do={
+  :local PathVal [ $FileGet $Path ];
+  :if ($PathVal->"type" = "directory") do={
     $LogPrint debug $0 ("... which already exists.");
     :return true;
   }

From 460d1055888d58e314694f4c0e0442db3d12e3f0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 21:38:26 +0200
Subject: [PATCH 03/17] global-functions: $RmDir: use $FileGet ...

... to work around restrictions in new file handling
---
 global-functions.rsc | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index 4ad3ac24..54a1211d 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1059,25 +1059,26 @@
 :set RmDir do={
   :local DirName [ :tostr $1 ];
 
+  :global FileGet;
   :global LogPrint;
 
   $LogPrint debug $0 ("Removing directory: ". $DirName);
 
-  :if ([ :len [ /file/find where name=$DirName type!=directory ] ] > 0) do={
-    $LogPrint error $0 ("Directory '" . $DirName . "' is not a directory.");
-    :return false;
-  }
-
-  :local Dir [ /file/find where name=$DirName type=directory ];
-  :if ([ :len $Dir ] = 0) do={
+  :local DirVal [ $FileGet $DirName ];
+  :if ($DirVal = false) do={
     $LogPrint debug $0 ("... which does not exist.");
     :return true;
   }
 
+  :if ($DirVal->"type" != "directory") do={
+    $LogPrint error $0 ("Directory '" . $DirName . "' is not a directory.");
+    :return false;
+  }
+
   :onerror Err {
-    /file/remove $Dir;
+    /file/remove $DirName;
   } do={
-    $LogPrint error $0 ("Removing directory '" . $DirName . "' (" . $Dir . ") failed: " . $Err);
+    $LogPrint error $0 ("Removing directory '" . $DirName . "' failed: " . $Err);
     :return false;
   }
   :return true;

From 396bfe511f00096ef75860510527c29945b1e4c7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 21:41:34 +0200
Subject: [PATCH 04/17] global-functions: $RmFile: use $FileGet ...

... to work around restrictions in new file handling
---
 global-functions.rsc | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index 54a1211d..e94b1dbb 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1088,25 +1088,26 @@
 :set RmFile do={
   :local FileName [ :tostr $1 ];
 
+  :global FileGet;
   :global LogPrint;
 
   $LogPrint debug $0 ("Removing file: ". $FileName);
 
-  :if ([ :len [ /file/find where name=$FileName (type=directory or type=disk) ] ] > 0) do={
-    $LogPrint error $0 ("File '" . $FileName . "' is not a file.");
-    :return false;
-  }
-
-  :local File [ /file/find where name=$FileName !(type=directory or type=disk) ];
-  :if ([ :len $File ] = 0) do={
+  :local FileVal [ $FileGet $FileName ];
+  :if ($FileVal = false) do={
     $LogPrint debug $0 ("... which does not exist.");
     :return true;
   }
 
+  :if ($FileVal->"type" = "directory" || $FileVal->"type" = "disk") do={
+    $LogPrint error $0 ("File '" . $FileName . "' is not a file.");
+    :return false;
+  }
+
   :onerror Err {
-    /file/remove $File;
+    /file/remove $FileName;
   } do={
-    $LogPrint error $0 ("Removing file '" . $FileName . "' (" . $File . ") failed: " . $Err);
+    $LogPrint error $0 ("Removing file '" . $FileName . "' failed: " . $Err);
     :return false;
   }
   :return true;

From b418c69a8820970048c9acad8922e7b845d82ce3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 20:48:05 +0200
Subject: [PATCH 05/17] global-functions: $WaitForFile: drop the workaround

This was fixed in RouterOS 7.18rc1, so should be ok to remove now.
---
 global-functions.rsc | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index e94b1dbb..4ee9f52c 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1759,15 +1759,6 @@
     :set I ($I + 1);
   }
 
-  :while ([ :len [ /file/find where name=$FileName ] ] > 0) do={
-    :do {
-      /file/get $FileName;
-      :return true;
-    } on-error={ }
-    :delay $Delay;
-    :set Delay ($Delay * 3 / 2);
-  }
-
   :return false;
 }
 

From 27f374ff88df0c805938e293e4b621f57224a71f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 21:25:20 +0200
Subject: [PATCH 06/17] global-functions: $WaitForFile: use :retry for
 simplification, ...

... and to work around restrictions in new file handling
---
 global-functions.rsc | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index 4ee9f52c..32bf2b4a 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1748,16 +1748,14 @@
   :global MAX;
 
   :set FileName [ $CleanFilePath $FileName ];
-  :local I 1;
   :local Delay ([ $MAX [ $EitherOr $WaitTime 2s ] 100ms ] / 10);
 
-  :while ([ :len [ /file/find where name=$FileName ] ] = 0) do={
-    :if ($I >= 10) do={
-      :return false;
-    }
-    :delay $Delay;
-    :set I ($I + 1);
-  }
+  :do {
+    :retry {
+      /file/get $FileName;
+      :return true;
+    } delay=$Delay max=10;
+  } on-error={ }
 
   :return false;
 }

From beb0798bd56fb299c8f3b70156502b26e590a8fc Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 20:34:07 +0200
Subject: [PATCH 07/17] global-functions: introduce $FileExists

---
 global-functions.rsc | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/global-functions.rsc b/global-functions.rsc
index 32bf2b4a..fbfd2579 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -38,6 +38,7 @@
 :global ExitError;
 :global FetchHuge;
 :global FetchUserAgentStr;
+:global FileExists;
 :global FileGet;
 :global FormatLine;
 :global FormatMultiLines;
@@ -530,6 +531,29 @@
     $Resource->"architecture-name" . " " . $Caller . "/Fetch (https://rsc.eworm.de/)");
 }
 
+# check for existence of file, optionally with type
+:set FileExists do={
+  :local FileName [ :tostr $1 ];
+  :local Type     [ :tostr $2 ];
+
+  :global FileGet;
+
+  :local FileVal [ $FileGet $FileName ];
+  :if ($FileVal = false) do={
+    :return false;
+  }
+
+  :if ([ :len ($FileVal->"size") ] = 0) do={
+    :return false;
+  }
+
+  :if ([ :len $Type ] = 0 || $FileVal->"type" = $Type) do={
+    :return true;
+  }
+
+  :return false;
+}
+
 # get file properties in array, or false on error
 :set FileGet do={
   :local FileName [ :tostr $1 ];

From f8eff5b7951ba499f2273b9c9a4bba58437fa520 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 20:44:49 +0200
Subject: [PATCH 08/17] global-functions: $DownloadPackage: use $FileExists

---
 global-functions.rsc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index fbfd2579..74ca91b0 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -365,6 +365,7 @@
 
   :global CertificateAvailable;
   :global CleanFilePath;
+  :global FileExists;
   :global LogPrint;
   :global MkDir;
   :global RmFile;
@@ -385,7 +386,7 @@
     :return false;
   }
 
-  :if ([ :len [ /file/find where name=$PkgDest type="package" ] ] > 0) do={
+  :if ([ $FileExists $PkgDest "package" ] = true) do={
     $LogPrint info $0 ("Package file " . $PkgName . " already exists.");
     :return true;
   }
@@ -407,7 +408,7 @@
     :return false;
   }
 
-  :if ([ /file/get [ find where name=$PkgDest ] type ] != "package") do={
+  :if ([ $FileExists $PkgDest "package" ] = false) do={
     $LogPrint warning $0 ("Downloaded file is not a package, removing.");
     $RmFile $PkgDest;
     :return false;

From 6e050ed9849b7c06869719ac3ba8e275b883a154 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 22:39:18 +0200
Subject: [PATCH 09/17] backup-email: use :retry and $FileExists

---
 backup-email.rsc | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/backup-email.rsc b/backup-email.rsc
index 632d2e60..cff6fd83 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -27,6 +27,7 @@
 
   :global CleanName;
   :global DeviceInfo;
+  :global FileExists;
   :global FormatLine;
   :global LogPrint;
   :global MkDir;
@@ -124,16 +125,16 @@
     attach=$Attach; remove-attach=true });
 
   # wait for the mail to be sent
-  :local I 0;
-  :while ([ :len [ /file/find where name ~ ($FilePath . "\\.(backup|rsc)\$") ] ] > 0) do={
-    :if ($I >= 120) do={
-      $LogPrint warning $ScriptName ("Files are still available, sending e-mail failed.");
-      :set PackagesUpdateBackupFailure true;
-      :set ExitOK true;
-      :error false;
-    }
-    :delay 1s;
-    :set I ($I + 1);
+  :do {
+    :retry {
+      :if ([ $FileExists ($FilePath . ".backup") "backup" ] = true || \
+           [ $FileExists ($FilePath . ".rsc") "script" ] = true) do={
+        :error "Files are still available.";
+      }
+    } delay=1s max=120;
+  } on-error={
+    $LogPrint warning $ScriptName ("Files are still available, sending e-mail failed.");
+    :set PackagesUpdateBackupFailure true;
   }
 } do={
   :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;

From 7708666ffdb31bbe39aba697ddfd8a55dc9f84f0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 2 Jun 2025 23:52:29 +0200
Subject: [PATCH 10/17] backup-email: check for .conf file

---
 backup-email.rsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backup-email.rsc b/backup-email.rsc
index cff6fd83..cc621055 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -127,7 +127,8 @@
   # wait for the mail to be sent
   :do {
     :retry {
-      :if ([ $FileExists ($FilePath . ".backup") "backup" ] = true || \
+      :if ([ $FileExists ($FilePath . ".conf") ".conf file" ] = true || \
+           [ $FileExists ($FilePath . ".backup") "backup" ] = true || \
            [ $FileExists ($FilePath . ".rsc") "script" ] = true) do={
         :error "Files are still available.";
       }

From a5248c7df12d0043648e24884684dc1c2dd28a3f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 2 Jun 2025 23:49:50 +0200
Subject: [PATCH 11/17] backup-email: add a comment why files are not removed

---
 backup-email.rsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backup-email.rsc b/backup-email.rsc
index cc621055..8015beaa 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -137,6 +137,7 @@
     $LogPrint warning $ScriptName ("Files are still available, sending e-mail failed.");
     :set PackagesUpdateBackupFailure true;
   }
+  # do not remove the files here, as the mail is still queued!
 } do={
   :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 0b4a1d88e0100d5a6dba565e7438719d1c2db015 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 22:46:03 +0200
Subject: [PATCH 12/17] mod/notification-email: use $FileExists

---
 mod/notification-email.rsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index 52937668..75e11b9d 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -40,6 +40,7 @@
 
   :global EitherOr;
   :global EMailGenerateFrom;
+  :global FileExists;
   :global IsDNSResolving;
   :global IsTimeSync;
   :global LogPrint;
@@ -93,7 +94,7 @@
       :onerror Err {
         :local Attach ({});
         :foreach File in=[ :toarray [ $EitherOr ($Message->"attach") "" ] ] do={
-          :if ([ :len [ /file/find where name=$File ] ] = 1) do={
+          :if ([ $FileExists $File ] = true) do={
             :set Attach ($Attach, $File);
           } else={
             $LogPrint warning $0 ("File '" . $File . "' does not exist, can not attach.");

From 20145174396dbd3567ce3708ce0389a5d54e6182 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 22:46:16 +0200
Subject: [PATCH 13/17] mod/notification-email: use $RmFile

---
 mod/notification-email.rsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index 75e11b9d..ad9762a3 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -44,6 +44,7 @@
   :global IsDNSResolving;
   :global IsTimeSync;
   :global LogPrint;
+  :global RmFile;
 
   :local AllDone true;
   :local QueueLen [ :len $EmailQueue ];
@@ -111,7 +112,7 @@
             :set Wait false;
             :if (($Message->"remove-attach") = true) do={
               :foreach File in=$Attach do={
-                /file/remove $File;
+                $RmFile $File;
               }
             }
           }

From abc02d8a94370626beb5b8ea078a28e5dd617f98 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 22:48:57 +0200
Subject: [PATCH 14/17] mod/ssh-keys-import: use $FileExists

---
 mod/ssh-keys-import.rsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index 94675255..7bdc95da 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -75,6 +75,7 @@
   :local User     [ :tostr $2 ];
 
   :global EitherOr;
+  :global FileExists;
   :global LogPrint;
   :global ParseKeyValueStore;
   :global SSHKeysImport;
@@ -84,8 +85,7 @@
     :return false;
   }
 
-  :local File [ /file/find where name=$FileName ];
-  :if ([ :len $File ] = 0) do={
+  :if ([ $FileExists $FileName ] = true) do={
     $LogPrint warning $0 ("File '" . $FileName . "' does not exist.");
     :return false;
   }

From 91f641a59f028e01b48b03f60592d7f035641bb5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 22:41:03 +0200
Subject: [PATCH 15/17] telegram-chat: use $FileExists

---
 telegram-chat.rsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index fdd08838..7f7b7a79 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -30,6 +30,7 @@
   :global CertificateAvailable;
   :global EitherOr;
   :global EscapeForRegEx;
+  :global FileExists;
   :global GetRandom20CharAlNum;
   :global IfThenElse;
   :global LogPrint;
@@ -154,7 +155,7 @@
             :if ([ $WaitForFile ($File . ".done") [ $EitherOr $TelegramChatRunTime 20s ] ] = false) do={
               :set State ([ $SymbolForNotification "warning-sign" ] . "The command did not finish, still running in background.\n\n");
             }
-            :if ([ :len [ /file/find where name=($File . ".failed") ] ] > 0) do={
+            :if ([ $FileExists ($File . ".failed") ] = true) do={
               :set State ([ $SymbolForNotification "cross-mark" ] . "The command failed with an error!\n\n");
             }
             :local Content ([ /file/read chunk-size=32768 file=$File as-value ]->"data");

From c7636cc9e5cd385cb3b9e080aeab2cc20a4bf9d5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 2 Jun 2025 22:16:43 +0200
Subject: [PATCH 16/17] capsman-download-packages: use $FileGet

---
 capsman-download-packages.capsman.rsc  | 3 ++-
 capsman-download-packages.template.rsc | 3 ++-
 capsman-download-packages.wifi.rsc     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index cab1e4c3..e296e159 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -20,6 +20,7 @@
 
   :global CleanFilePath;
   :global DownloadPackage;
+  :global FileGet;
   :global LogPrint;
   :global MkDir;
   :global RmFile;
@@ -42,7 +43,7 @@
     :error false;
   }
 
-  :if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
+  :if ([ $FileGet $PackagePath ] = false) do={
     :if ([ $MkDir $PackagePath ] = false) do={
       $LogPrint warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
         $PackagePath . ") failed!");
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index ea411201..4040d4d0 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -21,6 +21,7 @@
 
   :global CleanFilePath;
   :global DownloadPackage;
+  :global FileGet;
   :global LogPrint;
   :global MkDir;
   :global RmFile;
@@ -44,7 +45,7 @@
     :error false;
   }
 
-  :if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
+  :if ([ $FileGet $PackagePath ] = false) do={
     :if ([ $MkDir $PackagePath ] = false) do={
       $LogPrint warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
         $PackagePath . ") failed!");
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index a8103569..809fe8e7 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -20,6 +20,7 @@
 
   :global CleanFilePath;
   :global DownloadPackage;
+  :global FileGet;
   :global LogPrint;
   :global MkDir;
   :global RmFile;
@@ -42,7 +43,7 @@
     :error false;
   }
 
-  :if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
+  :if ([ $FileGet $PackagePath ] = false) do={
     :if ([ $MkDir $PackagePath ] = false) do={
       $LogPrint warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
         $PackagePath . ") failed!");

From bc384f8802241b53946fe4e17e01e679cde0b3bf Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 30 May 2025 23:22:59 +0200
Subject: [PATCH 17/17] capsman-download-packages: adopt new functionality from
 file menu

---
 capsman-download-packages.capsman.rsc  | 8 ++++----
 capsman-download-packages.template.rsc | 8 ++++----
 capsman-download-packages.wifi.rsc     | 8 ++++----
 doc/capsman-download-packages.md       | 2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index e296e159..aaebf5c0 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -4,7 +4,7 @@
 #                         Michael Gisbers <michael@gisbers.de>
 # https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.15
+# requires RouterOS, version=7.18
 #
 # download and cleanup packages for CAP installation from CAPsMAN
 # https://rsc.eworm.de/doc/capsman-download-packages.md
@@ -54,8 +54,8 @@
       "). Please place your packages!");
   }
 
-  :foreach Package in=[ /file/find where type=package \
-        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+  :foreach Package in=[ /file/find recursive where path=$PackagePath \
+        type="package" package-version!=$InstalledVersion ] do={
     :local File [ /file/get $Package ];
     :if ($File->"package-architecture" = "mips") do={
       :set ($File->"package-architecture") "mipsbe";
@@ -67,7 +67,7 @@
     }
   }
 
-  :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
+  :if ([ :len [ /file/find recursive where path=$PackagePath type="package" ] ] = 0) do={
     $LogPrint info $ScriptName ("No packages available, downloading default set.");
     :foreach Arch in={ "arm"; "mipsbe" } do={
       :foreach Package in={ "routeros"; "wireless" } do={
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 4040d4d0..ebbba709 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -4,7 +4,7 @@
 #                         Michael Gisbers <michael@gisbers.de>
 # https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.15
+# requires RouterOS, version=7.18
 #
 # download and cleanup packages for CAP installation from CAPsMAN
 # https://rsc.eworm.de/doc/capsman-download-packages.md
@@ -56,8 +56,8 @@
       "). Please place your packages!");
   }
 
-  :foreach Package in=[ /file/find where type=package \
-        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+  :foreach Package in=[ /file/find recursive where path=$PackagePath \
+        type="package" package-version!=$InstalledVersion ] do={
     :local File [ /file/get $Package ];
     :if ($File->"package-architecture" = "mips") do={
       :set ($File->"package-architecture") "mipsbe";
@@ -69,7 +69,7 @@
     }
   }
 
-  :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
+  :if ([ :len [ /file/find recursive where path=$PackagePath type="package" ] ] = 0) do={
     $LogPrint info $ScriptName ("No packages available, downloading default set.");
 # NOT /interface/wifi/ #
     :foreach Arch in={ "arm"; "mipsbe" } do={
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 809fe8e7..7de0431f 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -4,7 +4,7 @@
 #                         Michael Gisbers <michael@gisbers.de>
 # https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.15
+# requires RouterOS, version=7.18
 #
 # download and cleanup packages for CAP installation from CAPsMAN
 # https://rsc.eworm.de/doc/capsman-download-packages.md
@@ -54,8 +54,8 @@
       "). Please place your packages!");
   }
 
-  :foreach Package in=[ /file/find where type=package \
-        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+  :foreach Package in=[ /file/find recursive where path=$PackagePath \
+        type="package" package-version!=$InstalledVersion ] do={
     :local File [ /file/get $Package ];
     :if ($File->"package-architecture" = "mips") do={
       :set ($File->"package-architecture") "mipsbe";
@@ -67,7 +67,7 @@
     }
   }
 
-  :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
+  :if ([ :len [ /file/find recursive where path=$PackagePath type="package" ] ] = 0) do={
     $LogPrint info $ScriptName ("No packages available, downloading default set.");
     :foreach Arch in={ "arm"; "arm64" } do={
       :local Packages { "arm"={ "routeros"; "wifi-qcom"; "wifi-qcom-ac" };
diff --git a/doc/capsman-download-packages.md b/doc/capsman-download-packages.md
index 57222272..4daad494 100644
--- a/doc/capsman-download-packages.md
+++ b/doc/capsman-download-packages.md
@@ -4,7 +4,7 @@ Download packages for CAP upgrade from CAPsMAN
 [![GitHub stars](https://img.shields.io/github/stars/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=red)](https://github.com/eworm-de/routeros-scripts/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=green)](https://github.com/eworm-de/routeros-scripts/network)
 [![GitHub watchers](https://img.shields.io/github/watchers/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=blue)](https://github.com/eworm-de/routeros-scripts/watchers)
-[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.15-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
+[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.18-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
 [![Telegram group @routeros_scripts](https://img.shields.io/badge/Telegram-%40routeros__scripts-%2326A5E4?logo=telegram&style=flat)](https://t.me/routeros_scripts)
 [![donate with PayPal](https://img.shields.io/badge/Like_it%3F-Donate!-orange?logo=githubsponsors&logoColor=orange&style=flat)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)