From c708832b69ece50eca184b0946eebd5b3c579475 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 13 Sep 2024 10:32:40 +0200
Subject: check-routeros-update: use $VersionToNum to calculate bitmask

---
 check-routeros-update.rsc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index 3584a94..84849ea 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -62,6 +62,9 @@
 
   :local NumInstalled [ $VersionToNum ($Update->"installed-version") ];
   :local NumLatest [ $VersionToNum ($Update->"latest-version") ];
+  :local BitMask [ $VersionToNum "255.255zero0" ];
+  :local NumInstalledFeature ($NumInstalled & $BitMask);
+  :local NumLatestFeature ($NumLatest & $BitMask);
   :local Link ("https://mikrotik.com/download/changelogs/" . $Update->"channel" . "-release-tree");
 
   :if ($NumLatest < 117505792) do={
@@ -80,7 +83,7 @@
       $DoUpdate;
     }
 
-    :if ($SafeUpdatePatch = true && ($NumInstalled & 0xffff0000) = ($NumLatest & 0xffff0000)) do={
+    :if ($SafeUpdatePatch = true && $NumInstalledFeature = $NumLatestFeature) do={
       $LogPrint info $ScriptName ("Version " . $Update->"latest-version" . " is a patch release, updating...");
       $SendNotification2 ({ origin=$ScriptName; \
         subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update: " . $Update->"latest-version"); \
@@ -125,7 +128,7 @@
     }
 
     :if ([ $ScriptFromTerminal $ScriptName ] = true) do={
-      :if (($Update->"channel") = "testing" && ($NumInstalled & 0xffff0000) < ($NumLatest & 0xffff0000)) do={
+      :if (($Update->"channel") = "testing" && $NumInstalledFeature < $NumLatestFeature) do={
         :put ("This is a feature update in testing channel. Switch to channel 'stable'? [y/N]");
         :if (([ /terminal/inkey timeout=60 ] % 32) = 25) do={
           /system/package/update/set channel=stable;
-- 
cgit v1.2.3-70-g09d2