From cdd607037eba0571dd137e9efa507353d88a81c8 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 14 Dec 2021 16:44:01 +0100 Subject: README: drop hint on branch 'routeros-v7' --- README.md | 21 +++------------------ global-config | 5 +---- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 990aef9..02cb009 100644 --- a/README.md +++ b/README.md @@ -118,30 +118,15 @@ to be updated automatically! ### Changes for RouterOS v6 -RouterOS v6 will become deprecated at some time in the future, but to date -it is still the default for these scripts (in branch `main`). This will -change however, so if you want to stay with RouterOS v6 for some time add -these lines to your `global-config-overlay`, if missing: +RouterOS v7 is the way to go, let's consider RouterOS v6 deprecated. +If you want to stay with RouterOS v6 for some time add these lines +to your `global-config-overlay`, if missing: # Use branch routeros-v6 with RouterOS v6: :global ScriptUpdatesUrlSuffix "\?h=routeros-v6"; Then reload the configuration. -### Changes for RouterOS v7 - -RouterOS v7 is developed in paralled to RouterOS v6. The former brings some -shiny new features, the latter provides proven stability. - -The changes require incompatible changes to scripts, so these changes go to -a separate branch. If you decide to run RouterOS v7 please switch to branch -`routeros-v7` by adding these lines to your `global-config-overlay`: - - # Use branch routeros-v7 with RouterOS v7: - :global ScriptUpdatesUrlSuffix "\?h=routeros-v7"; - -Then reload the configuration and continue below to update scripts. - Updating scripts ---------------- diff --git a/global-config b/global-config index 024e52f..02d99b4 100644 --- a/global-config +++ b/global-config @@ -159,14 +159,11 @@ # alternative urls - main: stable code - next: currently in development #:global ScriptUpdatesBaseUrl "https://raw.githubusercontent.com/eworm-de/routeros-scripts/main/"; #:global ScriptUpdatesBaseUrl "https://raw.githubusercontent.com/eworm-de/routeros-scripts/next/"; -#:global ScriptUpdatesBaseUrl "https://raw.githubusercontent.com/eworm-de/routeros-scripts/routeros-v7/"; #:global ScriptUpdatesBaseUrl "https://gitlab.com/eworm-de/routeros-scripts/raw/main/"; #:global ScriptUpdatesBaseUrl "https://gitlab.com/eworm-de/routeros-scripts/raw/next/"; -#:global ScriptUpdatesBaseUrl "https://gitlab.com/eworm-de/routeros-scripts/raw/routeros-v7/"; :global ScriptUpdatesUrlSuffix ""; -# use next or routeros-v7 branch with default url (git.eworm.de) +# use next branch with default url (git.eworm.de) #:global ScriptUpdatesUrlSuffix "\?h=next"; -#:global ScriptUpdatesUrlSuffix "\?h=routeros-v7"; # Use this for defaults with $ScriptRunOnce # Install module with: -- cgit v1.2.3-54-g00ecf