README: hardcode url suffix, update info

3 files changed, 8 insertions, 25 deletions

diff --git a/README.md b/README.md
index 97cf318..7b01c54 100644
--- a/README.md
+++ b/README.md
@@ -82,14 +82,9 @@ All following commands will verify the server certificate. For validity the
 certificate's lifetime is checked with local time, so make sure the device's
 date and time is set correctly!
 
-One extra step is required if you run RouterOS v6:
-
-    :global ScriptUpdatesUrlSuffix "\?h=routeros-v6";
-
 Now let's download the main scripts and add them in configuration on the fly.
 
-    :global ScriptUpdatesUrlSuffix;
-    :foreach Script in={ "global-config"; "global-config-overlay"; "global-functions" } do={ / system script add name=$Script source=([ / tool fetch check-certificate=yes-without-crl ("https://git.eworm.de/cgit/routeros-scripts/plain/" . $Script . $ScriptUpdatesUrlSuffix) output=user as-value]->"data"); };
+    :foreach Script in={ "global-config"; "global-config-overlay"; "global-functions" } do={ / system script add name=$Script source=([ / tool fetch check-certificate=yes-without-crl ("https://git.eworm.de/cgit/routeros-scripts/plain/" . $Script . "\?h=routeros-v6") output=user as-value]->"data"); };
 
 ![screenshot: import scripts](README.d/04-import-scripts.avif)
 
@@ -118,10 +113,8 @@ 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:
+Let's consider RouterOS v6 being legacy. 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";
@@ -130,15 +123,8 @@ 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";
+RouterOS v7 is the future, and default branch `main` expects it. Just drop
+`$ScriptUpdatesUrlSuffix` from your `global-config-overlay` to use that.
 
 Then reload the configuration and continue below to update scripts.
 
diff --git a/global-config b/global-config
index d6509e0..ea5176e 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:
diff --git a/global-config.changes b/global-config.changes
index 5f9ddcc..e82f242 100644
--- a/global-config.changes
+++ b/global-config.changes
@@ -73,8 +73,8 @@
   67="Moved modules to directory with shorter name.";
   68="Reintroduced 'global-wait' for functions in scheduler.";
   69="Support hard lower limit for voltage in 'check-health'.";
-  70="MikroTik started pushing RouterOS v7. Changes are required if you run it, see https://git.eworm.de/cgit/routeros-scripts/about/#changes-for-routeros-v7";
-  71="MikroTik is pushing RouterOS v7 even more, in parallel branches. If you want to keep RouterOS v6 for some time see https://git.eworm.de/cgit/routeros-scripts/about/#changes-for-routeros-v6";
+  70="MikroTik started pushing RouterOS v7. Changes are required if you run it, see https://git.eworm.de/cgit/routeros-scripts/about/#requirements";
+  71="MikroTik is pushing RouterOS v7 even more, in parallel branches. If you want to keep RouterOS v6 for some time see https://git.eworm.de/cgit/routeros-scripts/about/#requirements";
   72="Introduced new script 'netwatch-dns' to manage DNS and DoH servers from netwatch.";
   73="Renamed backup scripts ('cloud-backup' -> 'backup-cloud', 'email-backup' -> 'backup-email', 'upload-backup' -> 'backup-upload').";
   74="Extended 'hotspot-to-wpa', it can now read additional configuration from templates and hotspot users.";