Additional Patches to Webs_Updates

Additional Patches to Webs_Updates
Reimplement the use of the $USE_BETA_WEIGHT

Author: ExtremeFiretop

MerlinAU.sh

@@ -4,7 +4,7 @@
 #
 # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
 # Official Co-Author: @Martinski W. - Date: 2023-Nov-01
-# Last Modified: 2025-Jul-23
+# Last Modified: 2025-Jul-24
 ###################################################################
 set -u
 
@@ -787,7 +787,7 @@ _GetFirmwareVariantFromRouter_()
 }
 
 ##-------------------------------------------##
-## Modified by ExtremeFiretop [2025-July-23] ##
+## Modified by ExtremeFiretop [2025-July-24] ##
 ##-------------------------------------------##
 _FWVersionStrToNum_()
 {
@@ -797,17 +797,25 @@ _FWVersionStrToNum_()
     USE_BETA_WEIGHT="$(Get_Custom_Setting FW_Allow_Beta_Production_Up)"
 
     local verNum  verStr="$1"
-    local fwBasecodeVers=""  numOfFields  buildDigits  isBeta=0  prodFlag
+    local fwBasecodeVers=""  numOfFields  buildDigits  isBeta=0  prodFlag  tagRank=2
+    local stableRank=2  betaRank=1  alphaRank=0
+
+    # If beta weight is NOT enabled, all tags get the same rank (0)
+    if [ "$USE_BETA_WEIGHT" != "ENABLED" ]
+    then
+        stableRank=0 ; betaRank=0 ; alphaRank=0
+    fi
+    tagRank="$stableRank"
 
     #--------------------------------------------------------------
     # Handle any 'alpha/beta' in the version string to be sure
     # that we always get good numerical values for comparison.
     #--------------------------------------------------------------
     if echo "$verStr" | grep -qiE '(alpha|beta)'
     then
-        isBeta=1
-        # Adjust weight value if "Beta-to-Production" update is enabled #
-        [ "$USE_BETA_WEIGHT" = "ENABLED" ]
+        if   echo "$verStr" | grep -qi 'alpha'; then tagRank="$alphaRank" ; isBeta=1
+        elif echo "$verStr" | grep -qi 'beta' ; then tagRank="$betaRank"  ; isBeta=1
+        fi
 
         # Replace '.alpha|.beta' and anything following it with ".0" #
         verStr="$(echo "$verStr" | sed 's/[.][Aa]lpha.*/.0/ ; s/[.][Bb]eta.*/.0/')"
@@ -836,13 +844,13 @@ _FWVersionStrToNum_()
     buildDigits="$(echo "$verStr" | sed -n 's/.*[^0-9]\([0-9]\+\)$/\1/p')"
     buildDigits=$(printf "%02d" "${buildDigits:-0}")
 
-    # Production flag: 1 = prod, 0 = beta/alpha
-    prodFlag="$((1 - isBeta))"
+    # Production/Beta/Alpha weight digit
+    prodFlag="$tagRank"
 
     # Strip the non-numeric tail so we feed only dotted numbers to awk
     verStr="$(echo "$verStr" | sed 's/[^0-9.]*$//')"
 
-    # Core numeric conversion (Major Minor Patch) + build suffix + prod flag
+    # Core numeric conversion (Major Minor Patch) + build suffix + tag weight
     verNum="$(echo "$verStr" | awk -F'.' '{printf ("%d%02d%02d\n", $1,$2,$3);}')${buildDigits}${prodFlag}"
 
     # Now prepend the F/W Basecode version #

gnuton_webs_update.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-readonly SCRIPT_VERSTAG="25070312"
+readonly SCRIPT_VERSTAG="25072411"
 
 wget_options="-q -t 2 -T 30"
 
@@ -20,8 +20,10 @@ fi
 current_base=$(nvram get firmver | sed "s/\.//g")
 current_firm=$(nvram get buildno | cut -d. -f1)
 current_buildno=$(nvram get buildno | cut -d. -f2)
-#Extract extendno, subtract value by 1 if it contains "alpha/beta", remove all other values such as "_rog" or "-g*"
-current_extendno="$(nvram get extendno | awk -F'[_-]' '{n=$1} /[aA]lpha|[bB]eta/{n--} END{print n}')"
+current_extendno="$(nvram get extendno | awk -F'[_-]' '{print $1}')"
+current_gnuton="$(nvram get extendno | sed -n 's/.*gnuton\([0-9]\+\).*/\1/p')"
+[ -z "$current_gnuton" ] && current_gnuton=0
+echo "$(nvram get extendno)" | grep -qiE 'beta|alpha' && current_is_beta=1 || current_is_beta=0
 
 # get firmware information
 model=$(nvram get productid)
@@ -50,6 +52,10 @@ else
 	extendno=$(echo $extendno | sed s/#.*//;)
 	lextendno=$(echo $extendno | sed s/-g.*//;)
 
+    new_gnuton="$(echo $extendno | sed -n 's/.*gnuton\([0-9]\+\).*/\1/p')"
+    [ -z "$new_gnuton" ] && new_gnuton=0
+    echo "$extendno" | grep -qiE 'beta|alpha' && new_is_beta=1 || new_is_beta=0
+
 	nvram set webs_state_info=${firmbase}_${firmver}_${buildno}_${extendno}
 
 	rm -f /tmp/wlan_update.*
@@ -72,6 +78,10 @@ else
 	        newfirm=1
 	elif [ "$current_base" -eq "$firmbase" ] && [ "$current_firm" -eq "$firmver" ] && [ "$current_buildno" -eq "$buildno" ] && [ "$current_extendno" -lt "$lextendno" ]; then
 		newfirm=1
+	elif [ "$current_base" -eq "$firmbase" ] && [ "$current_firm" -eq "$firmver" ] && [ "$current_buildno" -eq "$buildno" ] && [ "$current_extendno" -eq "$lextendno" ] && [ "$current_gnuton" -lt "$new_gnuton" ]; then
+		newfirm=1
+	elif [ "$current_base" -eq "$firmbase" ] && [ "$current_firm" -eq "$firmver" ] && [ "$current_buildno" -eq "$buildno" ] && [ "$current_extendno" -eq "$lextendno" ] && [ "$current_gnuton" -eq "$new_gnuton" ] && [ "$current_is_beta" -eq 1 ] && [ "$new_is_beta" -eq 0 ]; then
+		newfirm=1
 	else
 		newfirm=0
 	fi