From eba7ffb808e87d2f208a4ef1641765d1ddfb2a05 Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Thu, 5 Jun 2025 23:28:22 -0400 Subject: [PATCH 1/3] Silence Warnings Related to AiMesh/AP Login For AiMesh nodes, the password is always the same as the primary with no options to change, so we don't need the passwordloginchecker helper for those. And for an AP, they can be set to any password that doesn't match the primary, so displaying invalid password for those seems incorrect. --- MerlinAU.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index b08b0c6c..1ea0bd5b 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,12 +4,12 @@ # # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop. # Official Co-Author: @Martinski W. - Date: 2023-Nov-01 -# Last Modified: 2025-Jun-02 +# Last Modified: 2025-Jun-05 ################################################################### set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.4.7 +readonly SCRIPT_VERSION=1.4.8 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="master" @@ -4787,11 +4787,8 @@ _GetNodeInfo_() if [ $? -ne 0 ] then - _UpdateLoginPswdCheckHelper_ FAILURE - printf "\n${REDct}Login failed for AiMesh Node [$NodeIP_Address].${NOct}\n" return 1 fi - _UpdateLoginPswdCheckHelper_ SUCCESS # Retrieve the HTML content # htmlContent="$(curl -s -k "${NodeURLstr}/appGet.cgi?hook=nvram_get(productid)%3bnvram_get(asus_device_list)%3bnvram_get(cfg_device_list)%3bnvram_get(firmver)%3bnvram_get(buildno)%3bnvram_get(extendno)%3bnvram_get(webs_state_flag)%3bnvram_get(odmpid)%3bnvram_get(wps_modelnum)%3bnvram_get(model)%3bnvram_get(build_name)%3bnvram_get(lan_hostname)%3bnvram_get(webs_state_info)%3bnvram_get(label_mac)" \ From 5cecd66bb297aca46b507b4f37dcf8457001dfa7 Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Thu, 5 Jun 2025 23:29:32 -0400 Subject: [PATCH 2/3] Whoops Whoops --- MerlinAU.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 1ea0bd5b..225aa2bf 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -9,7 +9,7 @@ set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.4.8 +readonly SCRIPT_VERSION=1.4.7 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="master" From 5e92d3ed37c05fa28ba933916152ac5a67b8aa7a Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Thu, 5 Jun 2025 23:33:56 -0400 Subject: [PATCH 3/3] Double Whoops. I was right the first time Double Whoops. I was right the first time --- MerlinAU.sh | 2 +- README.md | 2 +- version.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 225aa2bf..1ea0bd5b 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -9,7 +9,7 @@ set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.4.7 +readonly SCRIPT_VERSION=1.4.8 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="master" diff --git a/README.md b/README.md index a98de726..1b7cc0f0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater -## v1.4.7 +## v1.4.8 ## 2025-Jun-03 ## WebUI: diff --git a/version.txt b/version.txt index be05bba9..b2e46d18 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.4.7 +1.4.8