1 files changed, 45 insertions, 26 deletions

diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index 8e29c67..e41db27 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -1,18 +1,19 @@
 #!rsc by RouterOS
 # RouterOS script: backup-cloud
-# Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
 # provides: backup-script, order=40
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.15
 #
 # upload backup to MikroTik cloud
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/backup-cloud.md
+# https://rsc.eworm.de/doc/backup-cloud.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
-:do {
+:local ExitOK false;
+:onerror Err {
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupRandomDelay;
@@ -25,6 +26,7 @@
   :global LogPrint;
   :global MkDir;
   :global RandomDelay;
+  :global RmDir;
   :global ScriptFromTerminal;
   :global ScriptLock;
   :global SendNotification2;
@@ -34,8 +36,17 @@
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
     :set PackagesUpdateBackupFailure true;
+    :set ExitOK true;
+    :error false;
+  }
+
+  :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={
+    $LogPrint warning $ScriptName ("Running from backup partition, refusing to act.");
+    :set PackagesUpdateBackupFailure true;
+    :set ExitOK true;
     :error false;
   }
+
   $WaitFullyConnected;
 
   :if ([ $ScriptFromTerminal $ScriptName ] = false && $BackupRandomDelay > 0) do={
@@ -44,26 +55,33 @@
 
   :if ([ $MkDir ("tmpfs/backup-cloud") ] = false) do={
     $LogPrint error $ScriptName ("Failed creating directory!");
+    :set ExitOK true;
     :error false;
   }
 
-  :execute {
-    :global BackupPassword;
-    # we are not interested in output, but print is
-    # required to fetch information from cloud
-    /system/backup/cloud/print as-value;
-    :delay 20ms;
-    :if ([ :len [ /system/backup/cloud/find ] ] > 0) do={
-      /system/backup/cloud/upload-file action=create-and-upload \
-          password=$BackupPassword replace=[ get ([ find ]->0) name ];
-    } else={
-      /system/backup/cloud/upload-file action=create-and-upload \
-          password=$BackupPassword;
-    }
-    /file/add name="tmpfs/backup-cloud/done";
-  } as-string;
+  :local I 5;
+  :do {
+    :execute {
+      :global BackupPassword;
+
+      :local Backup ([ /system/backup/cloud/find ]->0);
+      :if ([ :typeof $Backup ] = "id") do={
+        /system/backup/cloud/upload-file action=create-and-upload \
+            password=$BackupPassword replace=$Backup;
+      } else={
+        /system/backup/cloud/upload-file action=create-and-upload \
+            password=$BackupPassword;
+      }
+      /file/add name="tmpfs/backup-cloud/done";
+    } as-string;
+    :set I ($I - 1);
+  } while=([ $WaitForFile "tmpfs/backup-cloud/done" 200ms ] = false && $I > 0);
 
   :if ([ $WaitForFile "tmpfs/backup-cloud/done" ] = true) do={
+    :if ($I < 4) do={
+      :log warning ($ScriptName . ": Retry successful, please discard previous connection errors.");
+    }
+
     :local Cloud [ /system/backup/cloud/get ([ find ]->0) ];
 
     $SendNotification2 ({ origin=$ScriptName; \
@@ -79,7 +97,8 @@
       message=("Failed uploading backup for " . $Identity . " to cloud!\n\n" . [ $DeviceInfo ]) });
     $LogPrint error $ScriptName ("Failed uploading backup for " . $Identity . " to cloud!");
     :set PackagesUpdateBackupFailure true;
-    :error false;
   }
-  /file/remove "tmpfs/backup-cloud";
-} on-error={ }
+  $RmDir "tmpfs/backup-cloud";
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+}