Skip to content

Commit b0499c9

Browse files
Merge pull request #550 from ExtremeFiretop/Node_Emails
Update Node Email Titles
2 parents 4a10e65 + 59dda91 commit b0499c9

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

MerlinAU.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
set -u
1010

1111
## Set version for each Production Release ##
12-
readonly SCRIPT_VERSION=1.5.10
13-
readonly SCRIPT_VERSTAG="26022202"
12+
readonly SCRIPT_VERSION=1.6.0
13+
readonly SCRIPT_VERSTAG="26022409"
1414
readonly SCRIPT_NAME="MerlinAU"
1515
## Set to "master" for Production Releases ##
1616
SCRIPT_BRANCH="dev"
@@ -3218,16 +3218,18 @@ _CreateEMailContent_()
32183218
if [ $# -eq 0 ] || [ -z "$1" ] ; then return 1 ; fi
32193219
local fwInstalledVersion fwNewUpdateVersion
32203220
local savedInstalledVersion savedNewUpdateVersion
3221-
local subjectStr emailBodyTitle="" release_version
3221+
local subjectStrTag subjectStr emailBodyTitle="" release_version
32223222

32233223
rm -f "$tempEMailContent" "$tempEMailBodyMsg"
32243224

3225-
local subjectStrTag="F/W Update Status"
3225+
if [ -s "$tempNodeEMailList" ]
3226+
then subjectStrTag="F/W Update Available"
3227+
else subjectStrTag="F/W Update Status"
32263228
if echo "$1" | grep -q '._SCRIPT_UPDATE_.'
32273229
then subjectStrTag="Script Update Status"
32283230
fi
32293231
if [ -s "$tempNodeEMailList" ]
3230-
then subjectStr="$subjectStrTag for $node_lan_hostname"
3232+
then subjectStr="$subjectStrTag for AiMesh Node(s)"
32313233
else subjectStr="$subjectStrTag for $MODEL_ID"
32323234
fi
32333235

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater
22

3-
## v1.5.10
4-
## 2026-Feb-22
3+
## v1.6.0
4+
## 2026-Feb-24
55

66
## WebUI:
77
![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e)

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.10
1+
1.6.0

0 commit comments

Comments
 (0)