From 6cbe13a135fe39c097b6a7078506d99eedde2e06 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 22 May 2024 11:58:26 +0200
Subject: backup-partition: move code to a local function

---
 backup-partition.rsc | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/backup-partition.rsc b/backup-partition.rsc
index 9eeb1ae..a72dd0b 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -21,6 +21,22 @@
   :global ScriptFromTerminal;
   :global ScriptLock;
 
+  :local CopyTo do={
+    :local ScriptName [ :tostr $1 ];
+    :local FallbackTo [ :tostr $2 ];
+
+    :global LogPrint;
+
+    :do {
+      /partitions/copy-to $FallbackTo;
+      $LogPrint info $ScriptName ("Copied RouterOS to partition '" . $FallbackTo . "'.");
+      :return true;
+    } on-error={
+      $LogPrint error $ScriptName ("Failed copying RouterOS to partition '" . $FallbackTo . "'!");
+      :return false;
+    }
+  }
+
   :if ([ $ScriptLock $ScriptName ] = false) do={
     :set PackagesUpdateBackupFailure true;
     :error false;
@@ -46,11 +62,7 @@
     :if ([ $ScriptFromTerminal $ScriptName ] = true) do={
       :put ("The partitions have different RouterOS versions. Copy over to '" . $FallbackTo . "'? [y/N]");
       :if (([ /terminal/inkey timeout=60 ] % 32) = 25) do={
-        :do {
-          /partitions/copy-to $FallbackTo;
-          $LogPrint info $ScriptName ("Copied RouterOS to partition '" . $FallbackTo . "'.");
-        } on-error={
-          $LogPrint error $ScriptName ("Failed copying RouterOS to partition '" . $FallbackTo . "'!");
+        :if ([ $CopyTo $ScriptName $FallbackTo ] = false) do={
           :set PackagesUpdateBackupFailure true;
           :error false;
         }
-- 
cgit v1.2.3-70-g09d2