44#
55# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
66# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
7- # Last Modified: 2025-Nov-10
7+ # Last Modified: 2025-Nov-16
88# ##################################################################
99set -u
1010
1111# # Set version for each Production Release ##
1212readonly SCRIPT_VERSION=1.5.7
13- readonly SCRIPT_VERSTAG=" 25111020 "
13+ readonly SCRIPT_VERSTAG=" 25111620 "
1414readonly SCRIPT_NAME=" MerlinAU"
1515# # Set to "master" for Production Releases ##
1616SCRIPT_BRANCH=" dev"
@@ -2544,9 +2544,9 @@ _WebUI_SetEmailConfigFileFromAMTM_()
25442544 _WriteVarDefToHelperJSFile_ " isEMailConfigEnabledInAMTM" " $isEMailConfigEnabledInAMTM " true
25452545}
25462546
2547- # #------------------------------------------ ##
2548- # # Modified by ExtremeFiretop [2025-May-21 ] ##
2549- # #------------------------------------------ ##
2547+ # #----------------------------------------##
2548+ # # Modified by Martinski W. [2025-Nov-16 ] ##
2549+ # #----------------------------------------##
25502550_ActionsAfterNewConfigSettings_ ()
25512551{
25522552 if [ ! -s " ${CONFIG_FILE} .bak" ] || \
@@ -2555,7 +2555,7 @@ _ActionsAfterNewConfigSettings_()
25552555
25562556 _ConfigOptionChanged_ ()
25572557 {
2558- if diff " $CONFIG_FILE " " ${CONFIG_FILE} .bak" | grep -q " $1 "
2558+ if diff -U0 " $CONFIG_FILE " " ${CONFIG_FILE} .bak" | grep -q " $1 "
25592559 then return 0
25602560 else return 1
25612561 fi
@@ -11333,7 +11333,7 @@ _Gnuton_Check_Webs_Update_Script_()
1133311333
1133411334 # (Re)bind/mount only if remote is newer version OR files differ #
1133511335 if [ " $remoteVersTag " -gt " $localVersTag " ] || \
11336- ! diff " $FW_UpdateCheckScript " " $dwnldGnutonWebsUpdateFilePath " > /dev/null 2>&1
11336+ ! diff -q " $FW_UpdateCheckScript " " $dwnldGnutonWebsUpdateFilePath " > /dev/null 2>&1
1133711337 then
1133811338 umount " $FW_UpdateCheckScript " 2> /dev/null
1133911339 mv -f " $dwnldGnutonWebsUpdateFilePath " " $fixedGnutonWebsUpdateFilePath "
0 commit comments