1 files changed, 30 insertions, 23 deletions

diff --git a/mod/scriptrunonce.rsc b/mod/scriptrunonce.rsc
index 199d852..7fcd5b5 100644
--- a/mod/scriptrunonce.rsc
+++ b/mod/scriptrunonce.rsc
@@ -1,49 +1,56 @@
 #!rsc by RouterOS
 # RouterOS script: mod/scriptrunonece
-# Copyright (c) 2020-2023 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.15
 #
 # download script and run it once
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/scriptrunonce.md
+# https://rsc.eworm.de/doc/mod/scriptrunonce.md
 
 :global ScriptRunOnce;
 
 # fetch and run script(s) once
-:set ScriptRunOnce do={
+:set ScriptRunOnce do={ :do {
   :local Scripts [ :toarray $1 ];
 
   :global ScriptRunOnceBaseUrl;
   :global ScriptRunOnceUrlSuffix;
 
-  :global LogPrintExit2;
+  :global FetchHuge;
+  :global LogPrint;
   :global ValidateSyntax;
 
   :foreach Script in=$Scripts do={
     :if (!($Script ~ "^(ftp|https?|sftp)://")) do={
       :if ([ :len $ScriptRunOnceBaseUrl ] = 0) do={
-        $LogPrintExit2 warning $0 ("Script '" . $Script . "' is not an url and base url is not available.") true;
+        $LogPrint warning $0 ("Script '" . $Script . "' is not an url and base url is not available.");
+        :return false;
       }
       :set Script ($ScriptRunOnceBaseUrl . $Script . ".rsc" . $ScriptRunOnceUrlSuffix);
     }
 
-    :local Source;
-    :do {    
-      :set Source ([ /tool/fetch check-certificate=yes-without-crl $Script output=user as-value ]->"data");
-    } on-error={
-      $LogPrintExit2 warning $0 ("Failed fetching script '" . $Script . "'!") false;
+    :local Source [ $FetchHuge $0 $Script true ];
+    :if ($Source = false) do={
+      $LogPrint warning $0 ("Failed fetching script '" . $Script . "'!");
+      :return false;
     }
 
-    :if ([ :len $Source ] > 0) do={
-      :if ([ $ValidateSyntax $Source ] = true) do={
-        :do {
-          $LogPrintExit2 info $0 ("Running script '" . $Script . "' now.") false;
-          [ :parse $Source ];
-        } on-error={
-          $LogPrintExit2 warning $0 ("The script '" . $Script . "' failed to run!") false;
-        }
-      } else={
-        $LogPrintExit2 warning $0 ("The script '" . $Script . "' failed syntax validation!") false;
-      }
+    :if ([ $ValidateSyntax $Source ] = false) do={
+      $LogPrint warning $0 ("The script '" . $Script . "' failed syntax validation!");
+      :return false;
     }
+
+    :do {
+      $LogPrint info $0 ("Running script '" . $Script . "' now.");
+      [ :parse $Source ];
+    } on-error={
+      $LogPrint warning $0 ("The script '" . $Script . "' failed to run!");
+      :return false;
+    }
+
+    :return true;
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }