daily-psk: drop main function, use :do with on-error

This commit is contained in:
Christian Hesse 2024-03-06 15:28:55 +01:00
parent 4ada2e7678
commit f79206a9b8
4 changed files with 16 additions and 24 deletions

View file

@ -14,8 +14,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global DailyPskMatchComment; :global DailyPskMatchComment;
:global DailyPskQrCodeUrl; :global DailyPskQrCodeUrl;
@ -31,7 +31,7 @@
:global WaitFullyConnected; :global WaitFullyConnected;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
$WaitFullyConnected; $WaitFullyConnected;
@ -89,6 +89,4 @@
} }
} }
} }
} } on-error={ }
$Main [ :jobname ];

View file

@ -14,8 +14,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global DailyPskMatchComment; :global DailyPskMatchComment;
:global DailyPskQrCodeUrl; :global DailyPskQrCodeUrl;
@ -31,7 +31,7 @@
:global WaitFullyConnected; :global WaitFullyConnected;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
$WaitFullyConnected; $WaitFullyConnected;
@ -88,6 +88,4 @@
} }
} }
} }
} } on-error={ }
$Main [ :jobname ];

View file

@ -15,8 +15,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global DailyPskMatchComment; :global DailyPskMatchComment;
:global DailyPskQrCodeUrl; :global DailyPskQrCodeUrl;
@ -32,7 +32,7 @@
:global WaitFullyConnected; :global WaitFullyConnected;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
$WaitFullyConnected; $WaitFullyConnected;
@ -104,6 +104,4 @@
} }
} }
} }
} } on-error={ }
$Main [ :jobname ];

View file

@ -14,8 +14,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global DailyPskMatchComment; :global DailyPskMatchComment;
:global DailyPskQrCodeUrl; :global DailyPskQrCodeUrl;
@ -31,7 +31,7 @@
:global WaitFullyConnected; :global WaitFullyConnected;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
$WaitFullyConnected; $WaitFullyConnected;
@ -89,6 +89,4 @@
} }
} }
} }
} } on-error={ }
$Main [ :jobname ];