From 8fc88c73f8cb99774727e7b96f9b85a8bf216c2c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 15 Nov 2021 20:22:56 +0100
Subject: shorten modules directory name (global-functions.d -> mod)

---
 global-functions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'global-functions')

diff --git a/global-functions b/global-functions
index 813e4b4..85fdf40 100644
--- a/global-functions
+++ b/global-functions
@@ -8,7 +8,7 @@
 # https://git.eworm.de/cgit/routeros-scripts/about/
 
 # expected configuration version
-:global ExpectedConfigVersion 66;
+:global ExpectedConfigVersion 67;
 
 # global variables not to be changed by user
 :global GlobalFunctionsReady false;
@@ -755,7 +755,7 @@
             :if ($ScriptVal->"name" = "global-config") do={
               :set ReloadGlobalConfig true;
             }
-            :if ($ScriptVal->"name" ~ ("^global-functions(\$|\\.d/.)")) do={
+            :if ($ScriptVal->"name" = "global-functions" || $ScriptVal->"name" ~ ("^mod/.")) do={
               :set ReloadGlobalFunctions true;
             }
           } else={
@@ -1242,7 +1242,7 @@
 }
 
 # load modules
-:foreach Script in=[ / system script find where name ~ "^global-functions\\.d/." ] do={
+:foreach Script in=[ / system script find where name ~ "^mod/." ] do={
   / system script run $Script;
 }
 
-- 
cgit v1.2.3-54-g00ecf