Skip to content

Code Improvements #532

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
Nov 17, 2025
Merged

Code Improvements #532

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
14 changes: 7 additions & 7 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2025-Nov-10
# Last Modified: 2025-Nov-16
###################################################################
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.5.7
readonly SCRIPT_VERSTAG="25111020"
readonly SCRIPT_VERSTAG="25111620"
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="dev"
Expand Down Expand Up @@ -2544,9 +2544,9 @@ _WebUI_SetEmailConfigFileFromAMTM_()
_WriteVarDefToHelperJSFile_ "isEMailConfigEnabledInAMTM" "$isEMailConfigEnabledInAMTM" true
}

##------------------------------------------##
## Modified by ExtremeFiretop [2025-May-21] ##
##------------------------------------------##
##----------------------------------------##
## Modified by Martinski W. [2025-Nov-16] ##
##----------------------------------------##
_ActionsAfterNewConfigSettings_()
{
if [ ! -s "${CONFIG_FILE}.bak" ] || \
Expand All @@ -2555,7 +2555,7 @@ _ActionsAfterNewConfigSettings_()

_ConfigOptionChanged_()
{
if diff "$CONFIG_FILE" "${CONFIG_FILE}.bak" | grep -q "$1"
if diff -U0 "$CONFIG_FILE" "${CONFIG_FILE}.bak" | grep -q "$1"
then return 0
else return 1
fi
Expand Down Expand Up @@ -11333,7 +11333,7 @@ _Gnuton_Check_Webs_Update_Script_()

# (Re)bind/mount only if remote is newer version OR files differ #
if [ "$remoteVersTag" -gt "$localVersTag" ] || \
! diff "$FW_UpdateCheckScript" "$dwnldGnutonWebsUpdateFilePath" >/dev/null 2>&1
! diff -q "$FW_UpdateCheckScript" "$dwnldGnutonWebsUpdateFilePath" >/dev/null 2>&1
then
umount "$FW_UpdateCheckScript" 2>/dev/null
mv -f "$dwnldGnutonWebsUpdateFilePath" "$fixedGnutonWebsUpdateFilePath"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater

## v1.5.7
## 2025-Nov-10
## 2025-Nov-16

## WebUI:
![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e)
Expand Down