Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions MerlinAU.sh
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-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"
Expand Down Expand Up @@ -4787,11 +4787,8 @@ _GetNodeInfo_()

if [ $? -ne 0 ]
then
_UpdateLoginPswdCheckHelper_ FAILURE
printf "\n${REDct}Login failed for AiMesh Node [$NodeIP_Address].${NOct}\n"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think at least some kind of warning may be useful here just in case it IS an AiMesh node that's having a problem with the login attempt (for some reason).

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)" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater
## v1.4.7
## v1.4.8
## 2025-Jun-03

## WebUI:
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.7
1.4.8