Merge branch 'do-with-on-error' into nextrouteros-7.15beta4-2

1 files changed, 5 insertions, 6 deletions

diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc
index ae259d7..0cc2405 100644
--- a/ppp-on-up.rsc
+++ b/ppp-on-up.rsc
@@ -11,12 +11,13 @@
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Main do={
-  :local ScriptName [ :tostr $1 ];
-  :local Interface           $2;
+:do {
+  :local ScriptName [ :jobname ];
 
   :global LogPrintExit2;
 
+  :local Interface $interface;
+
   :if ([ :typeof $Interface ] = "nothing") do={
     $LogPrintExit2 error $ScriptName ("This script is supposed to run from ppp on-up script hook.") true;
   }
@@ -35,6 +36,4 @@
       $LogPrintExit2 warning $ScriptName ("Running script '" . $ScriptName . "' failed!") false;
     }
   }
-}
-
-$Main [ :jobname ] $interface;
+} on-error={ }