packages-update: drop RouterOS version check...

... and allow all updates again. This requires RouterOS 7.13.
mod/notification-email: drop RouterOS version dependency
2024-05-14 10:04:19 +02:00 · 2024-01-11 21:32:54 +01:00 · 2024-01-11 21:32:54 +01:00 · 2024-01-11 21:32:54 +01:00 · 2024-01-11 21:32:54 +01:00
4 changed files with 2 additions and 11 deletions
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@ -4,9 +4,6 @@
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # provides: lease-script, order=80
-# NOT /caps-man/ #
-# requires RouterOS, version=7.12beta3
-# NOT /caps-man/ #
 #
 # manage and clean up private WPA passphrase after hotspot login
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/hotspot-to-wpa.md
--- a/hotspot-to-wpa-cleanup.wifiwave2.rsc
+++ b/hotspot-to-wpa-cleanup.wifiwave2.rsc
@ -4,7 +4,6 @@
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # provides: lease-script, order=80
-# requires RouterOS, version=7.12beta3
 #
 # manage and clean up private WPA passphrase after hotspot login
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/hotspot-to-wpa.md
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@ -43,7 +43,7 @@
  }

  :local EMailSettings [ /tool/e-mail/get ];
-  :if ([ :typeof [ :toip [ $EitherOr ($EMailSettings->"server") ($EMailSettings->"address") ] ] ] != "ip" && [ $IsDNSResolving ] = false) do={
+  :if ([ :typeof [ :toip ($EMailSettings->"server") ] ] != "ip" && [ $IsDNSResolving ] = false) do={
    $LogPrintExit2 debug $0 ("Server address is a DNS name and resolving fails, not flushing.") false;
    :return false;
  }
@ -138,7 +138,7 @@
  :local Cc [ $EitherOr ($EmailGeneralCcOverride->($Notification->"origin")) $EmailGeneralCc ];

  :local EMailSettings [ /tool/e-mail/get ];
-  :if ([ :len $To ] = 0 || [ $EitherOr ($EMailSettings->"server") ($EMailSettings->"address") ] = "0.0.0.0" || ($EMailSettings->"from") = "<>") do={
+  :if ([ :len $To ] = 0 || ($EMailSettings->"server") = "0.0.0.0" || ($EMailSettings->"from") = "<>") do={
    :return false;
  }

--- a/packages-update.rsc
+++ b/packages-update.rsc
@ -33,11 +33,6 @@ $ScriptLock $0;
 :local NumInstalled [ $VersionToNum ($Update->"installed-version") ];
 :local NumLatest [ $VersionToNum ($Update->"latest-version") ];

-:if ($NumInstalled < 0x070d0000 && $NumLatest > 0x070d0000) do={
-  $LogPrintExit2 error $0 ("Migration to wireless/wifi package in RouterOS " . \
-    ($Update->"latest-version") . " is pending. Please update manually!") true;
-}
-
 :local DoDowngrade false;
 :if ($NumInstalled > $NumLatest) do={
  :if ([ $ScriptFromTerminal $0 ] = true) do={
Author	SHA1	Message	Date
Christian Hesse	d6d73a6860	packages-update: drop RouterOS version check... ... and allow all updates again. This requires RouterOS 7.13.	2024-01-11 21:32:54 +01:00
Christian Hesse	58006f8d71	mod/notification-email: drop RouterOS version dependency	2024-01-11 21:32:54 +01:00
Christian Hesse	62d8c80727	mod/notification-email: drop support for old property name	2024-01-11 21:32:54 +01:00
Christian Hesse	07e647e0a1	hotspot-to-wpa-cleanup: drop RouterOS version dependency	2024-01-11 21:32:54 +01:00