Merge branch 'main-function' into next

1 files changed, 20 insertions, 16 deletions

diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc
index ad09fdc..ae259d7 100644
--- a/ppp-on-up.rsc
+++ b/ppp-on-up.rsc
@@ -8,29 +8,33 @@
 # run scripts on ppp up
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/ppp-on-up.md
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global LogPrintExit2;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
+  :local Interface           $2;
 
-:local Interface $interface;
+  :global LogPrintExit2;
 
-:if ([ :typeof $Interface ] = "nothing") do={
-  $LogPrintExit2 error $0 ("This script is supposed to run from ppp on-up script hook.") true;
-}
+  :if ([ :typeof $Interface ] = "nothing") do={
+    $LogPrintExit2 error $ScriptName ("This script is supposed to run from ppp on-up script hook.") true;
+  }
 
-:local IntName [ /interface/get $Interface name ];
-$LogPrintExit2 info $0 ("PPP interface " . $IntName . " is up.") false;
+  :local IntName [ /interface/get $Interface name ];
+  $LogPrintExit2 info $ScriptName ("PPP interface " . $IntName . " is up.") false;
 
-/ipv6/dhcp-client/release [ find where interface=$IntName !disabled ];
+  /ipv6/dhcp-client/release [ find where interface=$IntName !disabled ];
 
-:foreach Script in=[ /system/script/find where source~("\n# provides: ppp-on-up\n") ] do={
-  :local ScriptName [ /system/script/get $Script name ];
-  :do {
-    $LogPrintExit2 debug $0 ("Running script: " . $ScriptName) false;
-    /system/script/run $Script;
-  } on-error={
-    $LogPrintExit2 warning $0 ("Running script '" . $ScriptName . "' failed!") false;
+  :foreach Script in=[ /system/script/find where source~("\n# provides: ppp-on-up\n") ] do={
+    :local ScriptName [ /system/script/get $Script name ];
+    :do {
+      $LogPrintExit2 debug $ScriptName ("Running script: " . $ScriptName) false;
+      /system/script/run $Script;
+    } on-error={
+      $LogPrintExit2 warning $ScriptName ("Running script '" . $ScriptName . "' failed!") false;
+    }
   }
 }
+
+$Main [ :jobname ] $interface;