Skip to content

Minor Fixes and Additions #451

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
Martinski4GitHub merged 7 commits into from
Apr 10, 2025
Merged

Minor Fixes and Additions #451

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd2089f
Minor Fixes
ExtremeFiretop Apr 9, 2025
b017713
Update MerlinAU.sh
ExtremeFiretop Apr 9, 2025
42bb8b1
Update MerlinAU.asp
ExtremeFiretop Apr 9, 2025
412f735
Update version.txt
ExtremeFiretop Apr 9, 2025
66a45da
Update README.md
ExtremeFiretop Apr 9, 2025
37a57bc
Update MerlinAU.asp
ExtremeFiretop Apr 9, 2025
ccdfd31
Update README.md
ExtremeFiretop Apr 10, 2025
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
8 changes: 4 additions & 4 deletions MerlinAU.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2684,7 +2684,7 @@ function initializeCollapsibleSections()
<td>
<div style="display: inline-block;">
<input type="password" id="routerPassword" name="routerPassword" placeholder="Enter password"
style="width: 278px; display: inline-block; margin-left:2px; margin-top:3px;" maxlength="64"
style="width: 275px; display: inline-block; margin-left:2px; margin-top:3px;" maxlength="64"
Comment thread
ExtremeFiretop marked this conversation as resolved.
onKeyPress="return validator.isString(this, event)"
onblur="ValidatePasswordString(this,'onBLUR')"
onkeyup="ValidatePasswordString(this,'onKEYUP')"/>
Expand Down Expand Up @@ -2784,7 +2784,7 @@ function initializeCollapsibleSections()
<div id="fwCronScheduleHOUR">
<span style="margin-left:1px; margin-top:10px; font-size: 12px; font-weight: bolder;">Hour:</span>
<input type="text" autocomplete="off" autocapitalize="off" data-lpignore="true"
style="width: 7%; margin-left: 20px; margin-top:10px; margin-bottom:7px" maxlength="2"
style="width: 7%; margin-left: 19px; margin-top:10px; margin-bottom:7px" maxlength="2"
Comment thread
ExtremeFiretop marked this conversation as resolved.
id="fwScheduleHOUR" name="fwScheduleHOUR" value="0"
onKeyPress="return validator.isNumber(this,event)"
onkeyup="ValidateFWUpdateTime(this,'HOUR')"
Expand Down Expand Up @@ -2881,7 +2881,7 @@ function initializeCollapsibleSections()
</label>
</td>
<td>
<select id="rogFWBuildType" name="rogFWBuildType" style="width: 20%;" onchange="handleTUFROGChange(this)">
<select id="rogFWBuildType" name="rogFWBuildType" style="width: 21%;" onchange="handleTUFROGChange(this)">
Comment thread
ExtremeFiretop marked this conversation as resolved.
<option value="ROG">ROG</option>
<option value="Pure">Pure</option>
</select>
Expand All @@ -2899,7 +2899,7 @@ function initializeCollapsibleSections()
</label>
</td>
<td>
<select id="tuffFWBuildType" name="tuffFWBuildType" style="width: 20%;" onchange="handleTUFROGChange(this)">
<select id="tuffFWBuildType" name="tuffFWBuildType" style="width: 21%;" onchange="handleTUFROGChange(this)">
<option value="TUF">TUF</option>
<option value="Pure">Pure</option>
</select>
Expand Down
55 changes: 28 additions & 27 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2025-Apr-08
# Last Modified: 2025-Apr-09
###################################################################
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.4.1
readonly SCRIPT_VERSION=1.4.2
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="dev"
Expand Down Expand Up @@ -47,13 +47,6 @@ ScriptBuildNum=0
ScriptVersionNum=""
scriptUpdateNotify=0

##------------------------------------------##
Comment thread
ExtremeFiretop marked this conversation as resolved.
## Modified by ExtremeFiretop [2024-Oct-02] ##
##------------------------------------------##
# For minimum supported firmware version check #
MinFirmwareVerCheckFailed=false
MinSupportedFirmwareVers="3004.386.12.6"

# For router model check #
routerModelCheckFailed=false
offlineUpdateTrigger=false
Expand Down Expand Up @@ -196,12 +189,15 @@ readonly fwInstalledExtendNum="$(nvram get extendno)"
readonly fwInstalledInnerVers="$(nvram get innerver)"
readonly fwInstalledBranchVer="${fwInstalledBaseVers}.$(echo "$fwInstalledBuildVers" | awk -F'.' '{print $1}')"

##-------------------------------------##
## Added by Martinski W. [2024-Oct-03] ##
##-------------------------------------##
readonly MinSupportedFW_3004_386_Ver="3004.386.12.6"
readonly MinSupportedFW_3004_388_Ver="3004.388.6.2"
readonly MinSupportedFW_3006_102_Ver="3004.388.8.0"

Comment thread
ExtremeFiretop marked this conversation as resolved.
##------------------------------------------##
## Modified by ExtremeFiretop [2025-Apr-09] ##
##------------------------------------------##
# For minimum supported firmware version check #
MinFirmwareVerCheckFailed=false
readonly MinSupportedFW_3004_386_Ver="3004.386.13.2"
readonly MinSupportedFW_3004_388_Ver="3004.388.8.0"
readonly MinSupportedFW_3006_102_Ver="3004.388.8.2"

case "$fwInstalledBranchVer" in
"3004.386") MinSupportedFirmwareVers="$MinSupportedFW_3004_386_Ver" ;;
Expand Down Expand Up @@ -1137,9 +1133,9 @@ _UpdateLoginPswdCheckHelper_()
_WriteVarDefToPswdCheckJSFile_ "loginPswdCheckMsgStr" "$checkMsge"
}

##----------------------------------------##
## Modified by Martinski W. [2025-Apr-07] ##
##----------------------------------------##
##------------------------------------------##
## Modified by ExtremeFiretop [2025-Apr-09] ##
##------------------------------------------##
_InitCustomDefaultsConfig_()
{
[ ! -d "$SETTINGS_DIR" ] && mkdir -m 755 -p "$SETTINGS_DIR"
Expand All @@ -1158,6 +1154,7 @@ _InitCustomDefaultsConfig_()
echo "FW_New_Update_LOG_Preferred_Path=\"${FW_Update_LOG_BASE_DefaultDIR}\""
echo "FW_New_Update_EMail_CC_Name=TBD"
echo "FW_New_Update_EMail_CC_Address=TBD"
echo "FW_New_Update_Changelog_Approval=TBD"
Comment thread
ExtremeFiretop marked this conversation as resolved.
echo "credentials_base64 TBD"
echo "CheckChangeLog ENABLED"
echo "FW_Update_Check TBD"
Expand Down Expand Up @@ -2852,7 +2849,7 @@ _SCRIPT_UPDATE_()

if [ "$SCRIPT_VERSION" = "$DLRepoVersion" ] && { [ -z "$DLRepoBuildNum" ] || [ "$DLRepoBuildNum" = "$ScriptBuildNum" ]; }
then
echo -e "${CYANct}You are on the latest version! Would you like to download anyways?${NOct}"
echo -e "${CYANct}You are on the latest version! Would you like to download anyway?${NOct}"
Comment thread
ExtremeFiretop marked this conversation as resolved.
echo -e "${CYANct}This will overwrite your currently installed version.${NOct}"
if _WaitForYESorNO_
then
Expand Down Expand Up @@ -4350,9 +4347,9 @@ with the \"${GRNct}Web UI${NOct}\" access type on the \"Access restriction list\
return 1
}

##----------------------------------------##
## Modified by Martinski W. [2025-Mar-07] ##
##----------------------------------------##
##------------------------------------------##
## Modified by ExtremeFiretop [2025-Apr-09] ##
##------------------------------------------##
_GetLoginCredentials_()
{
local retry="yes" userName savedMsgStr
Expand Down Expand Up @@ -4415,6 +4412,8 @@ _GetLoginCredentials_()
if _WaitForYESorNO_ "\nWould you like to test the current login credentials?"
then
_TestLoginCredentials_ "$loginCredsENC" || continue
else
Comment thread
ExtremeFiretop marked this conversation as resolved.
_UpdateLoginPswdCheckHelper_ UNKNOWN
fi

# Stop the loop if the test passes or if the user chooses not to test #
Expand Down Expand Up @@ -7195,7 +7194,7 @@ _high_risk_phrases_interactive_()
if [ "$inMenuMode" = true ]
then
printf "\n ${REDct}*WARNING*: Found high-risk phrases in the changelog file.${NOct}"
printf "\n ${REDct}Would you like to continue with the firmware update anyways?${NOct}"
printf "\n ${REDct}Would you like to continue with the firmware update anyway?${NOct}"
Comment thread
ExtremeFiretop marked this conversation as resolved.
if ! _WaitForYESorNO_
then
Say "Exiting for changelog review."
Expand Down Expand Up @@ -10177,9 +10176,9 @@ _InvalidMenuSelection_()
_WaitForEnterKey_
}

##----------------------------------------##
## Modified by Martinski W. [2025-Feb-15] ##
##----------------------------------------##
##------------------------------------------##
## Modified by ExtremeFiretop [2025-Apr-09] ##
##------------------------------------------##
_ShowMainMenuOptions_()
{
local FW_NewUpdateVerStr FW_NewUpdateVersion
Expand Down Expand Up @@ -10261,8 +10260,10 @@ _ShowMainMenuOptions_()
fi
printf "\n${SEPstr}"

loginStatusMsg=$(grep "^var loginPswdCheckMsgStr =" "$PSWD_CHECK_JS" | awk -F"'" '{print $2}')
Comment thread
ExtremeFiretop marked this conversation as resolved.
printf "\n ${GRNct}1${NOct}. Run F/W Update Check Now\n"
printf "\n ${GRNct}2${NOct}. Set Router Login Password\n"
printf "\n ${GRNct}2${NOct}. Set Router Login Password"
printf "\n${padStr}[Currently ${InvBMGNct}$loginStatusMsg${NOct}]\n"

# Enable/Disable the ASUS Router's built-in "F/W Update Check" #
FW_UpdateCheckState="$(nvram get firmware_check_enable)"
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.1
## 2025-Apr-08
## v1.4.2
## 2025-Apr-09

## WebUI:
![image](https://github.com/user-attachments/assets/92701007-a902-4724-9bae-b255856a686a)
Expand Down
4 changes: 2 additions & 2 deletions version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1.4.1
25040806
1.4.2
25040902