From 4542c2b19e4b74ee37c02671c05f4025946d8bf7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 21 Jan 2025 18:16:57 +0100
Subject: [PATCH 01/18] global-functions: introduce $RmFile

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 48f1676..e41d352 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -63,6 +63,7 @@
 :global ProtocolStrip;
 :global RandomDelay;
 :global RequiredRouterOS;
+:global RmFile;
 :global ScriptFromTerminal;
 :global ScriptInstallUpdate;
 :global ScriptLock;
@@ -1004,6 +1005,26 @@
   :return true;
 }
 
+# remove file
+:set RmFile do={
+  :local FileName [ :tostr $1 ];
+
+  :global LogPrint;
+
+  :local File [ /file/find where name=$FileName type=file ];
+  :if ([ :len $File ] = 0) do={
+    :return true;
+  }
+
+  :do {
+    /file/remove $File;
+  } on-error={
+    $LogPrint error $0 ("Removing file '" . $FileName . "' (" . $File . ") failed.");
+    :return false;
+  }
+  :return true;
+}
+
 # check if script is run from terminal
 :set ScriptFromTerminal do={
   :local Script [ :tostr $1 ];

From 727495d9c4f7ff00a9d0c5dc1fd06e22ba3abe39 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 21 Jan 2025 18:21:28 +0100
Subject: [PATCH 02/18] global-functions: introduce $RmDir

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

diff --git a/global-functions.rsc b/global-functions.rsc
index e41d352..b7a3b6a 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -63,6 +63,7 @@
 :global ProtocolStrip;
 :global RandomDelay;
 :global RequiredRouterOS;
+:global RmDir;
 :global RmFile;
 :global ScriptFromTerminal;
 :global ScriptInstallUpdate;
@@ -1005,6 +1006,26 @@
   :return true;
 }
 
+# remove directory
+:set RmDir do={
+  :local DirName [ :tostr $1 ];
+
+  :global LogPrint;
+
+  :local Dir [ /file/find where name=$DirName type=directory ];
+  :if ([ :len $Dir ] = 0) do={
+    :return true;
+  }
+
+  :do {
+    /file/remove $Dir;
+  } on-error={
+    $LogPrint error $0 ("Removing directory '" . $DirName . "' (" . $Dir . ") failed.");
+    :return false;
+  }
+  :return true;
+}
+
 # remove file
 :set RmFile do={
   :local FileName [ :tostr $1 ];

From 7233dea5bb9e73a93599baf17077b80758934665 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 21 Jan 2025 19:24:38 +0100
Subject: [PATCH 03/18] global-functions: $RmFile: add debug output

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

diff --git a/global-functions.rsc b/global-functions.rsc
index b7a3b6a..50202f0 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1032,8 +1032,11 @@
 
   :global LogPrint;
 
+  $LogPrint debug $0 ("Removing file: ". $FileName);
+
   :local File [ /file/find where name=$FileName type=file ];
   :if ([ :len $File ] = 0) do={
+    $LogPrint debug $0 ("... which does not exist.");
     :return true;
   }
 

From 49d9fb1ffddfb973bed00aac3a36bf4dd8d6687a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 21 Jan 2025 19:24:05 +0100
Subject: [PATCH 04/18] global-functions: $RmDir: add debug output

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 50202f0..2799f39 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1012,8 +1012,11 @@
 
   :global LogPrint;
 
+  $LogPrint debug $0 ("Removing directory: ". $DirName);
+
   :local Dir [ /file/find where name=$DirName type=directory ];
   :if ([ :len $Dir ] = 0) do={
+    $LogPrint debug $0 ("... which does not exist.");
     :return true;
   }
 

From a8e5b5226bc6a11a0ccbca0f3becc85f9f4904e3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 10 Feb 2025 11:04:09 +0100
Subject: [PATCH 05/18] global-functions: $RmFile: fail on wrong type

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 2799f39..ac37dee 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1037,6 +1037,11 @@
 
   $LogPrint debug $0 ("Removing file: ". $FileName);
 
+  :if ([ :len [ /file/find where name=$FileName type!=file ] ] > 0) do={
+    $LogPrint error $0 ("File '" . $FileName . "' is not a file.");
+    :return false;
+  }
+
   :local File [ /file/find where name=$FileName type=file ];
   :if ([ :len $File ] = 0) do={
     $LogPrint debug $0 ("... which does not exist.");

From 82020ddd73163194eb75aaa6f57d8e41597a7e6f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 10 Feb 2025 11:03:34 +0100
Subject: [PATCH 06/18] global-functions: $RmDir: fail on wrong type

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

diff --git a/global-functions.rsc b/global-functions.rsc
index ac37dee..cf278eb 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1014,6 +1014,11 @@
 
   $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={
     $LogPrint debug $0 ("... which does not exist.");

From dbdf2952443ada35695925628999db4ddbe80be0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 21 Jan 2025 18:33:35 +0100
Subject: [PATCH 07/18] global-functions: $CertificateDownload: use $RmFile

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

diff --git a/global-functions.rsc b/global-functions.rsc
index cf278eb..782c1a3 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -149,6 +149,7 @@
   :global CleanName;
   :global FetchUserAgentStr;
   :global LogPrint;
+  :global RmFile;
   :global WaitForFile;
 
   $LogPrint info $0 ("Downloading and importing certificate with " . \
@@ -172,7 +173,7 @@
         dst-path=$FileName as-value;
       $WaitForFile $FileName;
       :if ([ /file/get $FileName size ] = 0) do={
-        /file/remove $FileName;
+        $RmFile $FileName;
         :error false;
       }
     } on-error={
@@ -183,7 +184,7 @@
 
   /certificate/import file-name=$FileName passphrase="" as-value;
   :delay 1s;
-  /file/remove [ find where name=$FileName ];
+  $RmFile $FileName;
 
   :if ([ :len [ /certificate/find where common-name=$CommonName ] ] = 0) do={
     /certificate/remove [ find where name~("^" . $FileName . "_[0-9]+\$") ];

From ea8ec6b580071d832df28fd78a9e3c4c07a17bef Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 21 Jan 2025 18:35:39 +0100
Subject: [PATCH 08/18] global-functions: $DownloadPackage: use $RmFile

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 782c1a3..b19ec56 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -343,6 +343,7 @@
   :global CleanFilePath;
   :global LogPrint;
   :global MkDir;
+  :global RmFile;
   :global WaitForFile;
 
   :if ([ :len $PkgName ] = 0) do={ :return false; }
@@ -386,7 +387,7 @@
       $LogPrint debug $0 ("Downloading package file failed.");
     }
 
-    /file/remove [ find where name=$PkgDest ];
+    $RmFile $PkgDest;
     :set Retry ($Retry - 1);
   }
 

From d19b90df08dd179163c501a08d53eaf15bc53f15 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 21 Jan 2025 18:37:01 +0100
Subject: [PATCH 09/18] global-functions: $FetchHuge: use $RmFile

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

diff --git a/global-functions.rsc b/global-functions.rsc
index b19ec56..ab6610e 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -457,6 +457,7 @@
   :global IfThenElse;
   :global LogPrint;
   :global MkDir;
+  :global RmFile;
   :global WaitForFile;
 
   :set CheckCert [ $IfThenElse ($CheckCert = "false") "no" "yes-without-crl" ];
@@ -473,7 +474,7 @@
       http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) as-value;
   } on-error={
     :if ([ $WaitForFile $FileName 500ms ] = true) do={
-      /file/remove $FileName;
+      $RmFile $FileName;
     }
     $LogPrint debug $0 ("Failed downloading from: " . $Url);
     /file/remove $DirName;

From 4760515add1f753af7596245eb1a6c560ea37031 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 21 Jan 2025 18:38:09 +0100
Subject: [PATCH 10/18] global-functions: $FetchHuge: use $RmDir

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

diff --git a/global-functions.rsc b/global-functions.rsc
index ab6610e..e680b60 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -457,6 +457,7 @@
   :global IfThenElse;
   :global LogPrint;
   :global MkDir;
+  :global RmDir;
   :global RmFile;
   :global WaitForFile;
 
@@ -477,7 +478,7 @@
       $RmFile $FileName;
     }
     $LogPrint debug $0 ("Failed downloading from: " . $Url);
-    /file/remove $DirName;
+    $RmDir $DirName;
     :return false;
   }
   $WaitForFile $FileName;
@@ -493,7 +494,7 @@
       :delay 100ms;
     }
   }
-  /file/remove $DirName;
+  $RmDir $DirName;
   :return $Return;
 }
 

From f5f00b70e325d80db939dcc2aa885b80845566fa Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 21 Jan 2025 18:41:58 +0100
Subject: [PATCH 11/18] global-functions: $MkDir: use $RmDir

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

diff --git a/global-functions.rsc b/global-functions.rsc
index e680b60..4b1f63d 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -857,6 +857,7 @@
 
   :global CleanFilePath;
   :global LogPrint;
+  :global RmDir;
   :global WaitForFile;
 
   :local MkTmpfs do={
@@ -873,7 +874,7 @@
     }
 
     $LogPrint info $0 ("Creating disk of type tmpfs.");
-    /file/remove [ find where name="tmpfs" type="directory" ];
+    $RmDir "tmpfs";
     :do {
       /disk/add slot=tmpfs type=tmpfs tmpfs-max-size=([ /system/resource/get total-memory ] / 3);
       $WaitForFile "tmpfs";

From d748b69142a8b2b2d4328ef0e07dabe01fdbc01e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 7 Feb 2025 16:13:43 +0100
Subject: [PATCH 12/18] backup-cloud: use $RmDir

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

diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index 9d76080..c4e23b2 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -26,6 +26,7 @@
   :global LogPrint;
   :global MkDir;
   :global RandomDelay;
+  :global RmDir;
   :global ScriptFromTerminal;
   :global ScriptLock;
   :global SendNotification2;
@@ -97,7 +98,7 @@
     $LogPrint error $ScriptName ("Failed uploading backup for " . $Identity . " to cloud!");
     :set PackagesUpdateBackupFailure true;
   }
-  /file/remove "tmpfs/backup-cloud";
+  $RmDir "tmpfs/backup-cloud";
 } on-error={
   :global ExitError; $ExitError $ExitOK [ :jobname ];
 }

From 81ba47a07d97a4cc36fc020cf35de7656e2abbb2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 7 Feb 2025 16:10:46 +0100
Subject: [PATCH 13/18] backup-upload: use $RmDir

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

diff --git a/backup-upload.rsc b/backup-upload.rsc
index 533cc55..7f15a86 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -35,6 +35,7 @@
   :global LogPrint;
   :global MkDir;
   :global RandomDelay;
+  :global RmDir;
   :global ScriptFromTerminal;
   :global ScriptLock;
   :global SendNotification2;
@@ -170,7 +171,7 @@
   :if ($Failed = 1) do={
     :set PackagesUpdateBackupFailure true;
   }
-  /file/remove $DirName;
+  $RmDir $DirName;
 } on-error={
   :global ExitError; $ExitError $ExitOK [ :jobname ];
 }

From 88ff03136805f40f14bb5d39af370c0ace62c4e7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 7 Feb 2025 16:10:05 +0100
Subject: [PATCH 14/18] backup-upload: use $RmFile

---
 backup-upload.rsc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/backup-upload.rsc b/backup-upload.rsc
index 7f15a86..14c3914 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -36,6 +36,7 @@
   :global MkDir;
   :global RandomDelay;
   :global RmDir;
+  :global RmFile;
   :global ScriptFromTerminal;
   :global ScriptLock;
   :global SendNotification2;
@@ -100,7 +101,7 @@
       :set Failed 1;
     }
 
-    /file/remove ($FilePath . ".backup");
+    $RmFile ($FilePath . ".backup");
   }
 
   # create configuration export
@@ -119,7 +120,7 @@
       :set Failed 1;
     }
 
-    /file/remove ($FilePath . ".rsc");
+    $RmFile ($FilePath . ".rsc");
   }
 
   # global-config-overlay
@@ -140,7 +141,7 @@
       :set Failed 1;
     }
 
-    /file/remove ($FilePath . ".conf");
+    $RmFile ($FilePath . ".conf");
   }
 
   :local FileInfo do={

From 63db96bdccc9c9c1356e71683157383322b40285 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 7 Feb 2025 16:06:33 +0100
Subject: [PATCH 15/18] capsman-download-packages: use $RmFile

---
 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 2726af7..4387cb1 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -22,6 +22,7 @@
   :global DownloadPackage;
   :global LogPrint;
   :global MkDir;
+  :global RmFile;
   :global ScriptLock;
   :global WaitFullyConnected;
 
@@ -61,7 +62,7 @@
     :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
          ($File->"package-architecture") $PackagePath ] = true) do={
       :set Updated true;
-      /file/remove $Package;
+      $RmFile $Package;
     }
   }
 
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 0a42bb2..744494e 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -23,6 +23,7 @@
   :global DownloadPackage;
   :global LogPrint;
   :global MkDir;
+  :global RmFile;
   :global ScriptLock;
   :global WaitFullyConnected;
 
@@ -63,7 +64,7 @@
     :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
          ($File->"package-architecture") $PackagePath ] = true) do={
       :set Updated true;
-      /file/remove $Package;
+      $RmFile $Package;
     }
   }
 
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 037409a..a0c5e12 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -22,6 +22,7 @@
   :global DownloadPackage;
   :global LogPrint;
   :global MkDir;
+  :global RmFile;
   :global ScriptLock;
   :global WaitFullyConnected;
 
@@ -61,7 +62,7 @@
     :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
          ($File->"package-architecture") $PackagePath ] = true) do={
       :set Updated true;
-      /file/remove $Package;
+      $RmFile $Package;
     }
   }
 

From 6570a84904bcdd6d74090944f0fc94d1b94add90 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 7 Feb 2025 16:08:40 +0100
Subject: [PATCH 16/18] check-certificates: use $RmFile

---
 check-certificates.rsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/check-certificates.rsc b/check-certificates.rsc
index 25807cb..0907395 100644
--- a/check-certificates.rsc
+++ b/check-certificates.rsc
@@ -44,6 +44,7 @@
     :global EscapeForRegEx;
     :global FetchUserAgentStr;
     :global LogPrint;
+    :global RmFile;
     :global UrlEncode;
     :global WaitForFile;
 
@@ -63,7 +64,7 @@
             :set DecryptionFailed false;
           }
         }
-        /file/remove [ find where name=$CertFileName ];
+        $RmFile $CertFileName;
 
         :if ($DecryptionFailed = true) do={
           $LogPrint warning $ScriptName ("Decryption failed for certificate file '" . $CertFileName . "'.");

From 0fea300feaaaf8f3c87facb99e04126753713c76 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 7 Feb 2025 16:12:51 +0100
Subject: [PATCH 17/18] mod/ssh-keys-import: use $RmDir

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

diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index 35aa7ec..2fae4b1 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -19,6 +19,7 @@
   :global GetRandom20CharAlNum;
   :global LogPrint;
   :global MkDir;
+  :global RmDir;
   :global WaitForFile;
 
   :if ([ :len $Key ] = 0 || [ :len $User ] = 0) do={
@@ -58,10 +59,10 @@
     /user/ssh-keys/import public-key-file=$FileName user=$User;
     $LogPrint info $0 ("Imported ssh public key (" . $KeyVal->2 . ", " . $KeyVal->0 . ", " . \
       "MD5:" . $FingerPrintMD5 . ") for user '" . $User . "'.");
-    /file/remove "tmpfs/ssh-keys-import";
+    $RmDir "tmpfs/ssh-keys-import";
   } on-error={
     $LogPrint warning $0 ("Failed importing key.");
-    /file/remove "tmpfs/ssh-keys-import";
+    $RmDir "tmpfs/ssh-keys-import";
     :return false;
   }
 } on-error={

From b156fc43cfde99935eb78d95c6a5eae35b8f70f1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 7 Feb 2025 16:14:58 +0100
Subject: [PATCH 18/18] telegram-chat: use $RmDir

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

diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index 8f29d8c..10952a6 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -37,6 +37,7 @@
   :global MIN;
   :global MkDir;
   :global RandomDelay;
+  :global RmDir;
   :global ScriptLock;
   :global SendTelegram2;
   :global SymbolForNotification;
@@ -154,7 +155,7 @@
                 $State . [ $IfThenElse ([ :len $Content ] > 0) \
                 ([ $SymbolForNotification "memo" ] . "Output:\n" . $Content) \
                 ([ $SymbolForNotification "memo" ] . "No output.") ]) });
-            /file/remove "tmpfs/telegram-chat";
+            $RmDir "tmpfs/telegram-chat";
           } else={
             $LogPrint info $ScriptName ("The command from update " . $UpdateID . " failed syntax validation!");
             $SendTelegram2 ({ origin=$ScriptName; chatid=($Chat->"id"); silent=false; replyto=($Message->"message_id"); \