global-functions: $ScriptLock: do not exit from global function

Igor-Zgoda · Mar 12, 2024 · 1e8918f · 1e8918f
1 parent 56e97dd
commit 1e8918f
Show file tree

Hide file tree

Showing 57 changed files with 172 additions and 61 deletions.
diff --git a/backup-cloud.rsc b/backup-cloud.rsc
@@ -30,7 +30,9 @@
   :global SymbolForNotification;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :if ([ $ScriptFromTerminal $ScriptName ] = false && $BackupRandomDelay > 0) do={

diff --git a/backup-email.rsc b/backup-email.rsc
@@ -45,7 +45,9 @@
     $LogPrintExit2 error $ScriptName ("Configured to send neither backup nor config export.") true;
   }
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :if ([ $ScriptFromTerminal $ScriptName ] = false && $BackupRandomDelay > 0) do={

diff --git a/backup-partition.rsc b/backup-partition.rsc
@@ -18,7 +18,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :if ([ :len [ /partitions/find ] ] < 2) do={
     $LogPrintExit2 error $ScriptName ("Device does not have a fallback partition.") true;

diff --git a/backup-upload.rsc b/backup-upload.rsc
@@ -44,7 +44,9 @@
     $LogPrintExit2 error $ScriptName ("Configured to send neither backup nor config export.") true;
   }
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :if ([ $ScriptFromTerminal $ScriptName ] = false && $BackupRandomDelay > 0) do={

diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
@@ -24,7 +24,9 @@
   :global ScriptLock;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ];

diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
@@ -25,7 +25,9 @@
   :global ScriptLock;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ];

diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
@@ -24,7 +24,9 @@
   :global ScriptLock;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :local PackagePath [ $CleanFilePath [ /interface/wifi/capsman/get package-path ] ];

diff --git a/capsman-download-packages.wifiwave2.rsc b/capsman-download-packages.wifiwave2.rsc
@@ -24,7 +24,9 @@
   :global ScriptLock;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :local PackagePath [ $CleanFilePath [ /interface/wifiwave2/capsman/get package-path ] ];

diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
@@ -21,7 +21,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :local InstalledVersion [ /system/package/update/get installed-version ];
 

diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
@@ -22,7 +22,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :local InstalledVersion [ /system/package/update/get installed-version ];
 

diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
@@ -21,7 +21,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :local InstalledVersion [ /system/package/update/get installed-version ];
 

diff --git a/capsman-rolling-upgrade.wifiwave2.rsc b/capsman-rolling-upgrade.wifiwave2.rsc
@@ -21,7 +21,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :local InstalledVersion [ /system/package/update/get installed-version ];
 

diff --git a/certificate-renew-issued.rsc b/certificate-renew-issued.rsc
@@ -20,7 +20,9 @@
   :global MkDir;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :foreach Cert in=[ /certificate/find where issued expires-after<3w ] do={
     :local CertVal [ /certificate/get $Cert ];

diff --git a/check-certificates.rsc b/check-certificates.rsc
@@ -127,7 +127,9 @@
       [ $FormatLine "Expires in" [ $IfThenElse (($CertVal->"expired") = true) "expired" [ $FormatExpire ($CertVal->"expires-after") ] ] ]);
   }
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :foreach Cert in=[ /certificate/find where !revoked !ca !scep-url expires-after<$CertRenewTime ] do={

diff --git a/check-health.rsc b/check-health.rsc
@@ -39,7 +39,9 @@
     :return ($T->0 * 10 + $T->1);
   }
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :local Resource [ /system/resource/get ];
 

diff --git a/check-lte-firmware-upgrade.rsc b/check-lte-firmware-upgrade.rsc
@@ -18,7 +18,9 @@
 
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :if ([ :typeof $SentLteFirmwareUpgradeNotification ] != "array") do={
     :global SentLteFirmwareUpgradeNotification ({});

diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
@@ -41,7 +41,9 @@
     :error "Waiting for system to reboot.";
   }
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :if ([ :len [ /system/scheduler/find where name="_RebootForUpdate" ] ] > 0) do={

diff --git a/collect-wireless-mac.capsman.rsc b/collect-wireless-mac.capsman.rsc
@@ -28,7 +28,9 @@
   :global SendNotification2;
   :global SymbolForNotification;
 
-  $ScriptLock $ScriptName false 10;
+  :if ([ $ScriptLock $ScriptName 10 ] = false) do={
+    :return false;
+  }
 
   :if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
     /caps-man/access-list/add comment="--- collected above ---" disabled=yes;

diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc
@@ -28,7 +28,9 @@
   :global SendNotification2;
   :global SymbolForNotification;
 
-  $ScriptLock $ScriptName false 10;
+  :if ([ $ScriptLock $ScriptName 10 ] = false) do={
+    :return false;
+  }
 
   :if ([ :len [ /interface/wireless/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
     /interface/wireless/access-list/add comment="--- collected above ---" disabled=yes;

diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc
@@ -29,7 +29,9 @@
   :global SendNotification2;
   :global SymbolForNotification;
 
-  $ScriptLock $ScriptName false 10;
+  :if ([ $ScriptLock $ScriptName 10 ] = false) do={
+    :return false;
+  }
 
   :if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
   :if ([ :len [ /interface/wifi/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={

diff --git a/collect-wireless-mac.wifi.rsc b/collect-wireless-mac.wifi.rsc
@@ -28,7 +28,9 @@
   :global SendNotification2;
   :global SymbolForNotification;
 
-  $ScriptLock $ScriptName false 10;
+  :if ([ $ScriptLock $ScriptName 10 ] = false) do={
+    :return false;
+  }
 
   :if ([ :len [ /interface/wifi/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
     /interface/wifi/access-list/add comment="--- collected above ---" disabled=yes;

diff --git a/collect-wireless-mac.wifiwave2.rsc b/collect-wireless-mac.wifiwave2.rsc
@@ -28,7 +28,9 @@
   :global SendNotification2;
   :global SymbolForNotification;
 
-  $ScriptLock $ScriptName false 10;
+  :if ([ $ScriptLock $ScriptName 10 ] = false) do={
+    :return false;
+  }
 
   :if ([ :len [ /interface/wifiwave2/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
     /interface/wifiwave2/access-list/add comment="--- collected above ---" disabled=yes;

diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
@@ -30,7 +30,9 @@
   :global WaitForFile;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   # return pseudo-random string for PSK

diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
@@ -30,7 +30,9 @@
   :global WaitForFile;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   # return pseudo-random string for PSK

diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
@@ -31,7 +31,9 @@
   :global WaitForFile;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   # return pseudo-random string for PSK

diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
@@ -30,7 +30,9 @@
   :global WaitForFile;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   # return pseudo-random string for PSK

diff --git a/daily-psk.wifiwave2.rsc b/daily-psk.wifiwave2.rsc
@@ -30,7 +30,9 @@
   :global WaitForFile;
   :global WaitFullyConnected;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   # return pseudo-random string for PSK

diff --git a/dhcp-lease-comment.capsman.rsc b/dhcp-lease-comment.capsman.rsc
@@ -20,7 +20,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic=yes status=bound ] do={
     :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];

diff --git a/dhcp-lease-comment.local.rsc b/dhcp-lease-comment.local.rsc
@@ -20,7 +20,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic=yes status=bound ] do={
     :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];

diff --git a/dhcp-lease-comment.template.rsc b/dhcp-lease-comment.template.rsc
@@ -21,7 +21,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic=yes status=bound ] do={
     :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];

diff --git a/dhcp-lease-comment.wifi.rsc b/dhcp-lease-comment.wifi.rsc
@@ -20,7 +20,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic=yes status=bound ] do={
     :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];

diff --git a/dhcp-lease-comment.wifiwave2.rsc b/dhcp-lease-comment.wifiwave2.rsc
@@ -20,7 +20,9 @@
   :global LogPrintExit2;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic=yes status=bound ] do={
     :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];

diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc
@@ -26,7 +26,9 @@
   :global ParseKeyValueStore;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName false 10;
+  :if ([ $ScriptLock $ScriptName 10 ] = false) do={
+    :return false;
+  }
 
   :local Ttl 5m;
   :local CommentPrefix ("managed by " . $ScriptName);

diff --git a/firmware-upgrade-reboot.rsc b/firmware-upgrade-reboot.rsc
@@ -18,7 +18,9 @@
   :global ScriptLock;
   :global VersionToNum;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :local RouterBoard [ /system/routerboard/get ];
   :if ($RouterBoard->"current-firmware" = $RouterBoard->"upgrade-firmware") do={

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
@@ -34,7 +34,9 @@
     }
   }
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
   $WaitFullyConnected;
 
   :local ListComment ("managed by " . $ScriptName);