Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 5 deletions MerlinAU.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -3218,16 +3218,18 @@ _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
if [ -s "$tempNodeEMailList" ]
then subjectStr="$subjectStrTag for $node_lan_hostname"
then subjectStr="$subjectStrTag for AiMesh Node(s)"
else subjectStr="$subjectStrTag for $MODEL_ID"
fi

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.10
1.6.0