Skip to content

Fix Reported Gnuton Comparison Errors #505

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 1 commit into from
Aug 6, 2025
Merged

Fix Reported Gnuton Comparison Errors #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2025-Aug-02
# Last Modified: 2025-Aug-05
###################################################################
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.5.1
readonly SCRIPT_VERSION=1.5.2
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="dev"
Expand Down Expand Up @@ -839,9 +839,13 @@ _FWVersionStrToNum_()
verStr="$(echo "$verStr" | cut -d'.' -f2-)"
fi
#-----------------------------------------------------------
# NEW: capture any trailing build-suffix digits (e.g. "gnuton2" → 2)
# FIX: capture trailing build-suffix digits ONLY if there is
# a non-digit-and-non-dot char before them (e.g. "-gnuton2").
# Plain "388.9.2" should NOT set buildDigits.
#-----------------------------------------------------------
buildDigits="$(echo "$verStr" | sed -n 's/.*[^0-9]\([0-9]\+\)$/\1/p')"
if printf '%s' "$verStr" | grep -q '[^0-9.]'; then
buildDigits="$(printf '%s' "$verStr" | sed -n 's/^[0-9.]*[^0-9.]\+\([0-9]\+\)$/\1/p')"
fi
buildDigits=$(printf "%02d" "${buildDigits:-0}")

# Production/Beta/Alpha weight digit
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater
## v1.5.1
## 2025-Aug-04
## v1.5.2
## 2025-Aug-05

## WebUI:
![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.1
1.5.2