aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2021-12-14 16:44:01 +0100
committerGravatar Christian Hesse <mail@eworm.de>2022-01-14 09:20:09 +0100
commitcdd607037eba0571dd137e9efa507353d88a81c8 (patch)
tree19784fd13da19714ead5ee87d52d951dec112d2a
parentd03b6d9374b4f4884bfd90bfc04b1d26802d6666 (diff)
README: drop hint on branch 'routeros-v7'
-rw-r--r--README.md21
-rw-r--r--global-config5
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: