1 files changed, 15 insertions, 10 deletions
diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index d6b3b3f..2fae4b1 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -1,24 +1,25 @@
 #!rsc by RouterOS
 # RouterOS script: mod/ssh-keys-import
-# Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2020-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.14
+# requires RouterOS, version=7.16
 #
 # import ssh keys for public key authentication
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/ssh-keys-import.md
+# https://rsc.eworm.de/doc/mod/ssh-keys-import.md
 
 :global SSHKeysImport;
 :global SSHKeysImportFile;
 
 # import single key passed as string
-:set SSHKeysImport do={
+:set SSHKeysImport do={ :do {
   :local Key  [ :tostr $1 ];
   :local User [ :tostr $2 ];
 
   :global GetRandom20CharAlNum;
   :global LogPrint;
   :global MkDir;
+  :global RmDir;
   :global WaitForFile;
 
   :if ([ :len $Key ] = 0 || [ :len $User ] = 0) do={
@@ -58,16 +59,18 @@
     /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={
+  :global ExitError; $ExitError false $0;
+} }
 
 # import keys from a file
-:set SSHKeysImportFile do={
+:set SSHKeysImportFile do={ :do {
   :local FileName [ :tostr $1 ];
   :local User     [ :tostr $2 ];
 
@@ -106,4 +109,6 @@
       $LogPrint warning $0 ("SSH key of type '" . $KeyVal->0 . "' is not supported.");
     }
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }