Skip to content

Improved Subject Line for Script Update Emails #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ExtremeFiretop merged 1 commit into from
Apr 15, 2025
Merged

Improved Subject Line for Script Update Emails #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down