diff options
| -rw-r--r-- | global-config.rsc | 3 | ||||
| -rw-r--r-- | global-functions.rsc | 12 | ||||
| -rw-r--r-- | news-and-changes.rsc | 1 |
3 files changed, 4 insertions, 12 deletions
diff --git a/global-config.rsc b/global-config.rsc index 5d39c86..0c0a7b9 100644 --- a/global-config.rsc +++ b/global-config.rsc @@ -202,8 +202,7 @@ # This is the address used to send gps data to. :global GpsTrackUrl "https://example.com/index.php"; -# Enable this to fetch scripts from given url. -:global ScriptUpdatesFetch true; +# This is the base url to fetch scripts from. :global ScriptUpdatesBaseUrl "https://git.eworm.de/cgit/routeros-scripts/plain/"; # alternative urls - main: stable code - next: currently in development #:global ScriptUpdatesBaseUrl "https://raw.githubusercontent.com/eworm-de/routeros-scripts/main/"; diff --git a/global-functions.rsc b/global-functions.rsc index d9a040e..c6aee1f 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -12,7 +12,7 @@ :local 0 "global-functions"; # expected configuration version -:global ExpectedConfigVersion 109; +:global ExpectedConfigVersion 110; # global variables not to be changed by user :global GlobalFunctionsReady false; @@ -843,7 +843,6 @@ :global IDonate; :global NoNewsAndChangesNotification; :global ScriptUpdatesBaseUrl; - :global ScriptUpdatesFetch; :global ScriptUpdatesUrlSuffix; :global CertificateAvailable; @@ -878,12 +877,8 @@ :foreach Script in=[ /system/script/find where source~"^#!rsc by RouterOS\r?\n" ] do={ :local ScriptVal [ /system/script/get $Script ]; - :local ScriptFile [ /file/find where name=("script-updates/" . $ScriptVal->"name") . ".rsc" ]; + :local ScriptInfo [ $ParseKeyValueStore ($ScriptVal->"comment") ]; :local SourceNew; - :if ([ :len $ScriptFile ] > 0) do={ - :set SourceNew [ /file/get $ScriptFile contents ]; - /file/remove $ScriptFile; - } :foreach Scheduler in=[ /system/scheduler/find where on-event~("\\b" . $ScriptVal->"name" . "\\b") ] do={ :local SchedulerVal [ /system/scheduler/get $Scheduler ]; @@ -893,8 +888,6 @@ } } - :if ([ :len $SourceNew ] = 0 && $ScriptUpdatesFetch = true) do={ - :local ScriptInfo [ $ParseKeyValueStore ($ScriptVal->"comment") ]; :if (!($ScriptInfo->"ignore" = true)) do={ :do { :local BaseUrl $ScriptUpdatesBaseUrl; @@ -919,7 +912,6 @@ } } } - } :if ([ :len $SourceNew ] > 0) do={ :if ($SourceNew != $ScriptVal->"source") do={ diff --git a/news-and-changes.rsc b/news-and-changes.rsc index 29c8bd6..e16f074 100644 --- a/news-and-changes.rsc +++ b/news-and-changes.rsc @@ -23,6 +23,7 @@ 107="Dropped support for non-fixed width font in Telegram notifications."; 108="Enhanced 'log-forward' to list log messages with colorful bullets to indicate severity."; 109="Added support to send notifications via Ntfy (ntfy.sh)."; + 110="Dropped support for loading scripts from local storage."; }; # Migration steps to be applied on script updates |