From 16e704da43cc4ca6bf5f97de959a4b4bdbdb76a0 Mon Sep 17 00:00:00 2001 From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com> Date: Mon, 14 Apr 2025 23:33:39 -0700 Subject: [PATCH] Improved Subject Line for Script Update Emails Modified code to set a more appropriate Subject line for the "Script Update Status" email notifications. --- MerlinAU.sh | 15 ++++++++++----- README.md | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 9ef1de07..93bd7ffe 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -3034,9 +3034,9 @@ _GetLatestFWUpdateVersionFromRouter_() echo "$newVersionStr" ; return "$retCode" } -##------------------------------------------## -## Modified by ExtremeFiretop [2024-Apr-14] ## -##------------------------------------------## +##----------------------------------------## +## Modified by Martinski W. [2024-Apr-14] ## +##----------------------------------------## _CreateEMailContent_() { if [ $# -eq 0 ] || [ -z "$1" ] ; then return 1 ; fi @@ -3046,10 +3046,15 @@ _CreateEMailContent_() rm -f "$tempEMailContent" "$tempEMailBodyMsg" + local subjectStrTag="F/W Update Status" + if echo "$1" | grep -q '._SCRIPT_UPDATE_.' + then subjectStrTag="Script Update Status" + fi if [ -s "$tempNodeEMailList" ] - then subjectStr="F/W Update Status for $node_lan_hostname" - else subjectStr="F/W Update Status for $MODEL_ID" + then subjectStr="$subjectStrTag for $node_lan_hostname" + else subjectStr="$subjectStrTag for $MODEL_ID" fi + fwInstalledVersion="$(_GetCurrentFWInstalledLongVersion_)" if ! "$offlineUpdateTrigger" then diff --git a/README.md b/README.md index 36be3ec4..49c92abd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater -## v1.4.2 -## 2025-Apr-13 +## v1.4.3 +## 2025-Apr-14 ## WebUI: ![image](https://github.com/user-attachments/assets/a2197262-ca35-451a-8645-311896e1495e)