From 9c98095596a40540468206a45336e24aa5c8646d Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Tue, 24 Feb 2026 09:36:42 -0500 Subject: [PATCH 1/2] Update Node Email Titles Update Node Email Titles --- MerlinAU.sh | 6 +++--- README.md | 4 ++-- version.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 5bbf8c1..83f78e3 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -9,8 +9,8 @@ set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.5.10 -readonly SCRIPT_VERSTAG="26022202" +readonly SCRIPT_VERSION=1.6.0 +readonly SCRIPT_VERSTAG="26022409" readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -3227,7 +3227,7 @@ _CreateEMailContent_() then subjectStrTag="Script Update Status" fi if [ -s "$tempNodeEMailList" ] - then subjectStr="$subjectStrTag for $node_lan_hostname" + then subjectStr="$subjectStrTag for AiMesh Node(s)" else subjectStr="$subjectStrTag for $MODEL_ID" fi diff --git a/README.md b/README.md index cff1961..6e1a402 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater -## v1.5.10 -## 2026-Feb-22 +## v1.6.0 +## 2026-Feb-24 ## WebUI: ![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e) diff --git a/version.txt b/version.txt index f0ed379..dc1e644 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.5.10 +1.6.0 From 59dda9178c344ac263934fe9b0a3247217acabe0 Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Tue, 24 Feb 2026 09:47:16 -0500 Subject: [PATCH 2/2] Changing Title Changing Title --- MerlinAU.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 83f78e3..cd2fc89 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -3218,11 +3218,13 @@ _CreateEMailContent_() if [ $# -eq 0 ] || [ -z "$1" ] ; then return 1 ; fi local fwInstalledVersion fwNewUpdateVersion local savedInstalledVersion savedNewUpdateVersion - local subjectStr emailBodyTitle="" release_version + local subjectStrTag subjectStr emailBodyTitle="" release_version rm -f "$tempEMailContent" "$tempEMailBodyMsg" - local subjectStrTag="F/W Update Status" + if [ -s "$tempNodeEMailList" ] + then subjectStrTag="F/W Update Available" + else subjectStrTag="F/W Update Status" if echo "$1" | grep -q '._SCRIPT_UPDATE_.' then subjectStrTag="Script Update Status" fi