Skip to content

Commit 2ca47df

Browse files
Fine-Tuning
Fine-Tuning
1 parent 87e259f commit 2ca47df

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

MerlinAU.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11122,8 +11122,9 @@ _Gnuton_Check_Webs_Update_Script_()
1112211122
return 1 #NOT available so do nothing#
1112311123
fi
1112411124

11125-
# Only (re)bind if remote is newer OR the currently bound file is missing the version tag #
11126-
if [ "$remoteVerstag" -gt "$localVerstag" ] || [ "$localVerstag" -eq 0 ]
11125+
# Only (re)bind if remote is newer OR files differ #
11126+
if [ "$remoteVerstag" -gt "$localVerstag" ] || \
11127+
! diff "$FW_UpdateCheckScript" "$fixedWebsUpdateFilePath" >/dev/null 2>&1
1112711128
then
1112811129
umount "$FW_UpdateCheckScript" 2>/dev/null
1112911130
mount -o bind "$fixedWebsUpdateFilePath" "$FW_UpdateCheckScript"

gnuton_webs_update.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ else
5252
extendno=$(echo $extendno | sed s/#.*//;)
5353
lextendno=$(echo $extendno | sed s/-g.*//;)
5454
55-
new_gnuton="$(echo $extendno | sed -n 's/.*gnuton\([0-9]\+\).*/\1/p')"
56-
[ -z "$new_gnuton" ] && new_gnuton=0
57-
echo "$extendno" | grep -qiE 'beta|alpha' && new_is_beta=1 || new_is_beta=0
55+
new_gnuton="$(echo $extendno | sed -n 's/.*gnuton\([0-9]\+\).*/\1/p')"
56+
[ -z "$new_gnuton" ] && new_gnuton=0
57+
echo "$extendno" | grep -qiE 'beta|alpha' && new_is_beta=1 || new_is_beta=0
5858
5959
nvram set webs_state_info=${firmbase}_${firmver}_${buildno}_${extendno}
6060

0 commit comments

Comments
 (0)