Skip to content

Fixing More Comparison Errors #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Martinski4GitHub merged 12 commits into from
Jul 29, 2025
Merged

Fixing More Comparison Errors #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0c3198c
Fixing More Comparison Errors
ExtremeFiretop Jul 24, 2025
2b3a531
Missed one
ExtremeFiretop Jul 24, 2025
9e4a6fa
Committing Additional Logic Fixes
ExtremeFiretop Jul 24, 2025
1a57147
Additional Patches to Webs_Updates
ExtremeFiretop Jul 24, 2025
8cc7335
Allow Updates to Webs_Update Script
ExtremeFiretop Jul 24, 2025
8670488
Navigate around the binded file
ExtremeFiretop Jul 24, 2025
f26ba29
Workaround for Bound File
ExtremeFiretop Jul 24, 2025
87e259f
Cleanup
ExtremeFiretop Jul 24, 2025
e9865f4
Update gnuton_webs_update.sh
ExtremeFiretop Jul 24, 2025
2ca47df
Fine-Tuning
ExtremeFiretop Jul 25, 2025
a55b25c
Merge branch 'For-Testing' of https://github.com/ExtremeFiretop/Merli…
ExtremeFiretop Jul 25, 2025
c02bef1
Removing unnecessary unmount
ExtremeFiretop Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 76 additions & 29 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-18
# Last Modified: 2025-Jul-24
###################################################################
set -u

Expand Down Expand Up @@ -786,27 +786,36 @@ _GetFirmwareVariantFromRouter_()
echo "$hasGNUtonFW" ; return 0
}

##----------------------------------------##
## Modified by Martinski W. [2024-May-31] ##
##----------------------------------------##
##-------------------------------------------##
## Modified by ExtremeFiretop [2025-July-24] ##
##-------------------------------------------##
_FWVersionStrToNum_()
{
if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ]
then echo ; return 1 ; fi

USE_BETA_WEIGHT="$(Get_Custom_Setting FW_Allow_Beta_Production_Up)"

local verNum verStr="$1" nonProductionVersionWeight=0
local fwBasecodeVers="" numOfFields
local verNum verStr="$1"
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
# Adjust weight value if "Beta-to-Production" update is enabled #
[ "$USE_BETA_WEIGHT" = "ENABLED" ] && nonProductionVersionWeight=-100
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/')"
Expand All @@ -829,10 +838,20 @@ _FWVersionStrToNum_()
fwBasecodeVers="$(echo "$verStr" | cut -d'.' -f1)"
verStr="$(echo "$verStr" | cut -d'.' -f2-)"
fi
verNum="$(echo "$verStr" | awk -F '.' '{printf ("%d%02d%02d\n", $1,$2,$3);}')"
#-----------------------------------------------------------
# NEW: capture any trailing build-suffix digits (e.g. "gnuton2" → 2)
#-----------------------------------------------------------
buildDigits="$(echo "$verStr" | sed -n 's/.*[^0-9]\([0-9]\+\)$/\1/p')"
buildDigits=$(printf "%02d" "${buildDigits:-0}")

# Subtract non-production weight from the version number #
verNum="$((verNum + nonProductionVersionWeight))"
# 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 + tag weight
verNum="$(echo "$verStr" | awk -F'.' '{printf ("%d%02d%02d\n", $1,$2,$3);}')${buildDigits}${prodFlag}"

# Now prepend the F/W Basecode version #
[ -n "$fwBasecodeVers" ] && verNum="${fwBasecodeVers}$verNum"
Expand Down Expand Up @@ -2632,6 +2651,18 @@ _GetDLScriptVersion_()
return 0
}

##---------------------------------------##
## Added by ExtremeFiretop [2025-Jul-24] ##
##---------------------------------------##
_GetScriptVerstag_()
{
if [ $# -eq 0 ] || [ -z "$1" ] || [ ! -s "$1" ]
then echo 0 ; return 1 ; fi
sed -n 's/.*SCRIPT_VERSTAG="\([0-9]\+\)".*/\1/p' "$1" | tail -n1
[ $? -ne 0 ] && echo 0
}


##----------------------------------------##
## Modified by Martinski W. [2025-Feb-15] ##
##----------------------------------------##
Expand All @@ -2657,7 +2688,13 @@ _CurlFileDownload_()
then updatedWebUIPage=true
else updatedWebUIPage=false
fi
mv -f "$tempFilePathDL" "$2"
if grep -q " $2 " /proc/mounts 2>/dev/null
then
cat "$tempFilePathDL" > "$2"
rm -f "$tempFilePathDL"
else
mv -f "$tempFilePathDL" "$2"
fi
retCode=0
fi

Expand Down Expand Up @@ -2935,13 +2972,13 @@ _CreateEMailContent_()
fwInstalledVersion="$(_GetCurrentFWInstalledLongVersion_)"
if ! "$offlineUpdateTrigger"
then
fwNewUpdateVersion="$(_GetLatestFWUpdateVersionFromRouter_)"
fwNewUpdateVersion="$(_GetLatestFWUpdateVersionFromRouter_ 1)"
else
fwNewUpdateVersion="$(Get_Custom_Setting "FW_New_Update_Notification_Vers")"
fi

# Remove "_rog" or "_tuf" or -gHASHVALUES or -Gnuton* suffix to avoid version comparison failure, can't remove all for proper beta and alpha comparison #
fwInstalledVersion="$(echo "$fwInstalledVersion" | sed -E 's/(_(rog|tuf)|-g[0-9a-f]{10}|-gnuton[0-9]+)$//')"
# Remove "_rog" or "_tuf" or -gHASHVALUES suffix to avoid version comparison failure, can't remove all for proper beta and alpha comparison #
fwInstalledVersion="$(echo "$fwInstalledVersion" | sed -E 's/(_(rog|tuf)|-g[0-9a-f]{10})$//')"

case "$1" in
FW_UPDATE_TEST_EMAIL)
Expand Down Expand Up @@ -4843,7 +4880,7 @@ _GetLatestFWUpdateVersionFromGitHub_()

if ! "$offlineUpdateTrigger"
then
routerVersion="$(_GetLatestFWUpdateVersionFromRouter_)"
routerVersion="$(_GetLatestFWUpdateVersionFromRouter_ 1)"
else
routerVersion="$(Get_Custom_Setting "FW_New_Update_Notification_Vers")"
fi
Expand Down Expand Up @@ -4874,7 +4911,7 @@ _GetLatestFWUpdateVersionFromGitHub_()
# Extract the version portion from the URL #
urlVersion="$(echo "$theURL" \
| grep -oE "${PRODUCT_ID}_[^ ]*\.(w|pkgtb)" \
| sed "s/${PRODUCT_ID}_//;s/.w$//;s/.pkgtb$//;s/.ubi$//;s/_/./g;s/-gnuton[0-9][0-9]*\$//" | head -n1)"
| sed "s/${PRODUCT_ID}_//;s/.w$//;s/.pkgtb$//;s/.ubi$//;s/_/./g" | head -n1)"

if [ "$urlVersion" = "$routerVersion" ]
then
Expand Down Expand Up @@ -4905,7 +4942,7 @@ GetLatestFirmwareMD5URL()

if ! "$offlineUpdateTrigger"
then
routerVersion="$(_GetLatestFWUpdateVersionFromRouter_)"
routerVersion="$(_GetLatestFWUpdateVersionFromRouter_ 1)"
else
routerVersion="$(Get_Custom_Setting "FW_New_Update_Notification_Vers")"
fi
Expand Down Expand Up @@ -4937,7 +4974,7 @@ GetLatestFirmwareMD5URL()
# Extract the version portion from the URL #
md5Version="$(echo "$theURL" \
| grep -oE "${PRODUCT_ID}_[^ ]*\.(md5)" \
| sed "s/${PRODUCT_ID}_//;s/.md5$//;s/.w$//;s/.pkgtb$//;s/.ubi$//;s/_/./g;s/-gnuton[0-9][0-9]*\$//" | head -n1)"
| sed "s/${PRODUCT_ID}_//;s/.md5$//;s/.w$//;s/.pkgtb$//;s/.ubi$//;s/_/./g" | head -n1)"

if [ "$md5Version" = "$routerVersion" ]
then
Expand Down Expand Up @@ -8750,7 +8787,7 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or
# "New F/W Release Version" from the router itself.
# If no new F/W version update is available return.
#------------------------------------------------------
if ! release_version="$(_GetLatestFWUpdateVersionFromRouter_)" || \
if ! release_version="$(_GetLatestFWUpdateVersionFromRouter_ 1)" || \
! _CheckNewUpdateFirmwareNotification_ "$current_version" "$release_version"
then
Say "No new firmware version update is found for [$MODEL_ID] router model."
Expand Down Expand Up @@ -8792,7 +8829,7 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or

if ! "$offlineUpdateTrigger"
then
NewUpdate_VersionVerify="$(_GetLatestFWUpdateVersionFromRouter_)"
NewUpdate_VersionVerify="$(_GetLatestFWUpdateVersionFromRouter_ 1)"
if [ "$NewUpdate_VersionVerify" != "$release_version" ]
then
Say "WARNING: The release version found by MerlinAU [$release_version] does not match the F/W update version from the router [$NewUpdate_VersionVerify]."
Expand Down Expand Up @@ -10392,7 +10429,7 @@ _ShowMainMenuOptions_()
# Check if router reports a new F/W update is available.
# If yes, modify the notification settings accordingly.
#-----------------------------------------------------------#
if FW_NewUpdateVersion="$(_GetLatestFWUpdateVersionFromRouter_)" && \
if FW_NewUpdateVersion="$(_GetLatestFWUpdateVersionFromRouter_ 1)" && \
[ -n "$FW_NewUpdateVersion" ] && [ -n "$FW_InstalledVersion" ] && \
[ "$FW_NewUpdateVersion" != "$FW_NewUpdateVerInit" ]
then
Expand Down Expand Up @@ -11046,9 +11083,9 @@ _DoInitializationStartup_()
_SetDefaultBuildType_
}

##-------------------------------------##
## Added by Martinski W. [2025-Jul-03] ##
##-------------------------------------##
##-------------------------------------------##
## Modified by ExtremeFiretop [2025-July-24] ##
##-------------------------------------------##
#######################################################################
# TEMPORARY hack to check if the Gnuton F/W built-in 'webs_update.sh'
# script is the most recent version that includes required fixes.
Expand All @@ -11060,29 +11097,39 @@ _DoInitializationStartup_()
_Gnuton_Check_Webs_Update_Script_()
{
if ! "$isGNUtonFW" || \
! "$checkWebsUpdateScriptForGnuton" || \
grep -qE 'SCRIPT_VERSTAG="[0-9]+"' "$FW_UpdateCheckScript"
! "$checkWebsUpdateScriptForGnuton"
then
checkWebsUpdateScriptForGnuton=false
return 0
fi

local theWebsUpdateFile="webs_update.sh"
local fixedWebsUpdateFilePath="${SETTINGS_DIR}/$theWebsUpdateFile"
local localVerstag=0 remoteVerstag=0

#Get local VERSTAG (if any) #
localVerstag="$(_GetScriptVerstag_ "$FW_UpdateCheckScript")"
[ -z "$localVerstag" ] && localVerstag=0

## Get the fixed version of the script targeted for Gnuton F/W ##
# Get the fixed version of the script targeted for Gnuton F/W #
if _CurlFileDownload_ "gnuton_webs_update.sh" "$fixedWebsUpdateFilePath"
then
chmod 755 "$fixedWebsUpdateFilePath"
remoteVerstag="$(_GetScriptVerstag_ "$fixedWebsUpdateFilePath")"
[ -z "$remoteVerstag" ] && remoteVerstag=0
else
return 1 #NOT available so do nothing#
fi

if ! diff "$FW_UpdateCheckScript" "$fixedWebsUpdateFilePath" >/dev/null 2>&1
# Only (re)bind if remote is newer OR files differ #
if [ "$remoteVerstag" -gt "$localVerstag" ] || \
! diff "$FW_UpdateCheckScript" "$fixedWebsUpdateFilePath" >/dev/null 2>&1
then
umount "$FW_UpdateCheckScript" 2>/dev/null
mount -o bind "$fixedWebsUpdateFilePath" "$FW_UpdateCheckScript"
Say "${YLWct}Set up a fixed version of the \"${theWebsUpdateFile}\" script file.${NOct}"
else
rm -f "$fixedWebsUpdateFilePath"
fi
}

Expand Down
16 changes: 13 additions & 3 deletions gnuton_webs_update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

readonly SCRIPT_VERSTAG="25070312"
readonly SCRIPT_VERSTAG="25072411"

wget_options="-q -t 2 -T 30"

Expand All @@ -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)
Expand Down Expand Up @@ -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.*
Expand All @@ -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
Expand Down