Skip to content

Minor changes & fixes #465

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
May 6, 2025
Merged

Minor changes & fixes #465

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
19 changes: 9 additions & 10 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,15 @@ _UserLogMsg_()
}

##----------------------------------------##
## Modified by Martinski W. [2025-Feb-15] ##
## Modified by Martinski W. [2025-May-05] ##
##----------------------------------------##
Say()
{
local logMsg
"$isInteractive" && printf "${1}\n"
# Remove all "color escape sequences" from the system log file entries #
logMsg="$(echo "$1" | sed 's/\\\e\[[0-1]m//g ; s/\\\e\[[0-1];[3-4][0-9]m//g')"
logMsg="$(echo "$1" | \
sed 's/\\e\[[0-1]m//g; s/\\e\[[3-4][0-9]m//g; s/\\e\[[0-1];[3-4][0-9]m//g; s/\\e\[30;10[1-9]m//g; s/\\n/ /g')"
_UserLogMsg_ "$logMsg"
printf "$logMsg" | logger -t "[${SCRIPT_NAME}] $$"
}
Expand Down Expand Up @@ -2829,9 +2830,9 @@ _DownloadScriptFiles_()
return "$retCode"
}

##------------------------------------------##
## Modified by ExtremeFiretop [2025-Apr-14] ##
##------------------------------------------##
##----------------------------------------##
## Modified by Martinski W. [2025-May-05] ##
##----------------------------------------##
_SCRIPT_UPDATE_()
{
local extraParam=""
Expand Down Expand Up @@ -2868,7 +2869,6 @@ _SCRIPT_UPDATE_()
fi
return 1
fi
return 0
fi

! _CheckForNewScriptUpdates_ && return 1
Expand Down Expand Up @@ -4798,7 +4798,6 @@ _GetLatestFWUpdateVersionFromGitHub_()
grep -o "$grep_pattern" | \
grep -o "https://[^ ]*\.\(w\|pkgtb\)")"


if [ -z "$downloadURLs" ]
then
echo "**ERROR** **NO_GITHUB_URL**"
Expand Down Expand Up @@ -7311,7 +7310,7 @@ _ChangelogVerificationCheck_()
local current_version formatted_current_version
local release_version formatted_release_version
local checkChangeLogSetting="$(Get_Custom_Setting "CheckChangeLog")"
local changeLogFName changeLogFPath
local changeLogFName changeLogFPath changeLogTag

if [ "$checkChangeLogSetting" = "ENABLED" ]
then
Expand Down Expand Up @@ -7516,7 +7515,7 @@ _ManageChangelogGnuton_()
then echo "**ERROR** **NO_PARAMS**" ; return 1 ; fi

local mode="$1" # Mode should be 'download' or 'view' #
local wgetLogFile FW_Changelog_GITHUB changeLogTag
local wgetLogFile FW_Changelog_GITHUB

# Create directory to download changelog if missing
if ! _CreateDirectory_ "$FW_BIN_DIR" ; then return 1 ; fi
Expand Down Expand Up @@ -9050,7 +9049,7 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or

_SendEMailNotification_ POST_REBOOT_FW_UPDATE_SETUP
echo
Say "Flashing ${GRNct}${firmware_file}${NOct}... ${REDct}Please wait for reboot in about 4 minutes or less.${NOct}"
Say "Flashing ${GRNct}${firmware_file}${NOct}...\n${REDct}Please wait for reboot in about 4 minutes or less.${NOct}"
echo

# *WARNING*: NO MORE logging at this point & beyond #
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.3
## 2025-Apr-26
## v1.4.4
## 2025-May-???

## WebUI:
![image](https://github.com/user-attachments/assets/a2197262-ca35-451a-8645-311896e1495e)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.3
1.4.4