1 files changed, 19 insertions, 18 deletions
diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index cccb41b..88dd345 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -4,7 +4,7 @@
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # provides: backup-script, order=40
-# requires RouterOS, version=7.12
+# requires RouterOS, version=7.13
 #
 # upload backup to MikroTik cloud
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/backup-cloud.md
@@ -47,21 +47,23 @@
     :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={
     :local Cloud [ /system/backup/cloud/get ([ find ]->0) ];
@@ -71,7 +73,7 @@
       message=("Uploaded backup for " . $Identity . " to cloud.\n\n" . \
         [ $DeviceInfo ] . "\n\n" . \
         [ $FormatLine "Name" ($Cloud->"name") ] . "\n" . \
-        [ $FormatLine "Size" ([ $HumanReadableNum ($Cloud->"size") 1024 ] . "iB") ] . "\n" . \
+        [ $FormatLine "Size" ([ $HumanReadableNum ($Cloud->"size") 1024 ] . "B") ] . "\n" . \
         [ $FormatLine "Download key" ($Cloud->"secret-download-key") ]); silent=true });
   } else={
     $SendNotification2 ({ origin=$ScriptName; \
@@ -79,7 +81,6 @@
       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={ }