From c983cbee148069398de33cc85ef2bf12881e6692 Mon Sep 17 00:00:00 2001
From: "Martinski@GitHub" <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Thu, 4 Jul 2024 14:45:49 -0700
Subject: [PATCH] Fixed comparisons of F/W versions (#619)

Fixed 2 bugs in the code that were incorrectly comparing versions between the currently installed F/W with the next F/W update available.
---
 release/src/router/rom/webs_scripts/merlin_webs_update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/src/router/rom/webs_scripts/merlin_webs_update.sh b/release/src/router/rom/webs_scripts/merlin_webs_update.sh
index 57bc7dc351c..ca06e7fad4c 100755
--- a/release/src/router/rom/webs_scripts/merlin_webs_update.sh
+++ b/release/src/router/rom/webs_scripts/merlin_webs_update.sh
@@ -60,9 +60,9 @@ else
 	        newfirm=1
 	elif [ "$current_base" -eq "$firmbase" ] && [ "$current_firm" -lt "$firmver" ]; then
 	        newfirm=1
-	elif [ "$current_base" -eq "$firmbase" ] && [ "$current_firm" -eq "$current_firm" ] && [ "$current_buildno" -lt "$buildno" ]; then
+	elif [ "$current_base" -eq "$firmbase" ] && [ "$current_firm" -eq "$firmver" ] && [ "$current_buildno" -lt "$buildno" ]; then
 	        newfirm=1
-	elif [ "$current_base" -eq "$firmbase" ] && [ "$current_firm" -eq "$current_firm" ] && [ "$current_buildno" -eq "$buildno" ] && [ "$current_extendno" -lt "$lextendno" ]; then
+	elif [ "$current_base" -eq "$firmbase" ] && [ "$current_firm" -eq "$firmver" ] && [ "$current_buildno" -eq "$buildno" ] && [ "$current_extendno" -lt "$lextendno" ]; then
 		newfirm=1
 	else
 		newfirm=0