Skip to content

Commit 6641e63

Browse files
Merge pull request #459 from Martinski4GitHub/dev
Improved Subject Line for Script Update Emails
2 parents 9265e41 + 16e704d commit 6641e63

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

MerlinAU.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3034,9 +3034,9 @@ _GetLatestFWUpdateVersionFromRouter_()
30343034
echo "$newVersionStr" ; return "$retCode"
30353035
}
30363036

3037-
##------------------------------------------##
3038-
## Modified by ExtremeFiretop [2024-Apr-14] ##
3039-
##------------------------------------------##
3037+
##----------------------------------------##
3038+
## Modified by Martinski W. [2024-Apr-14] ##
3039+
##----------------------------------------##
30403040
_CreateEMailContent_()
30413041
{
30423042
if [ $# -eq 0 ] || [ -z "$1" ] ; then return 1 ; fi
@@ -3046,10 +3046,15 @@ _CreateEMailContent_()
30463046

30473047
rm -f "$tempEMailContent" "$tempEMailBodyMsg"
30483048

3049+
local subjectStrTag="F/W Update Status"
3050+
if echo "$1" | grep -q '._SCRIPT_UPDATE_.'
3051+
then subjectStrTag="Script Update Status"
3052+
fi
30493053
if [ -s "$tempNodeEMailList" ]
3050-
then subjectStr="F/W Update Status for $node_lan_hostname"
3051-
else subjectStr="F/W Update Status for $MODEL_ID"
3054+
then subjectStr="$subjectStrTag for $node_lan_hostname"
3055+
else subjectStr="$subjectStrTag for $MODEL_ID"
30523056
fi
3057+
30533058
fwInstalledVersion="$(_GetCurrentFWInstalledLongVersion_)"
30543059
if ! "$offlineUpdateTrigger"
30553060
then

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater
2-
## v1.4.2
3-
## 2025-Apr-13
2+
## v1.4.3
3+
## 2025-Apr-14
44

55
## WebUI:
66
![image](https://github.com/user-attachments/assets/a2197262-ca35-451a-8645-311896e1495e)

0 commit comments

Comments
 (0)