Skip to content
Merged
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
15 changes: 8 additions & 7 deletions MerlinAU.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2026-Apr-06
# Last Modified: 2026-Apr-08
###################################################################
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.6.1
readonly SCRIPT_VERSTAG="26040607"
readonly SCRIPT_VERSTAG="26040823"
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="dev"
Expand Down Expand Up @@ -5003,7 +5003,8 @@ _GetLoginCredentials_()

while [ "$retry" = "yes" ]
do
printf "=== Login Credentials ===\n\n"
printf "==== Router Login Password ====\n"
printf "[${MGNTct}<TAB>${NOct} key to show/hide, ${MGNTct}<ESC>${NOct} key to exit]\n\n"
_GetPasswordInput_ "Enter password for user ${GRNct}${userName}${NOct}"

if [ -z "$thePWSDstring" ]
Expand All @@ -5021,14 +5022,14 @@ _GetLoginCredentials_()
if [ "$thePWSDstring" != "$oldPWSDstring" ]
then
_UpdateLoginPswdCheckHelper_ NewPSWD
savedMsgStr="${GRNct}New credentials saved.${NOct}"
savedMsgStr="Login credentials are saved."
oldPWSDstring="$thePWSDstring"
else
_UpdateLoginPswdCheckHelper_ OldPSWD
savedMsgStr="${GRNct}Credentials remain unchanged.${NOct}"
savedMsgStr="Credentials remain unchanged."
fi
printf "\n${savedMsgStr}\n"
printf "Encoded Credentials:\n"
printf "\n\n${GRNct}${savedMsgStr}${NOct}\n"
printf "\nEncoded Credentials:\n"
printf "${GRNct}${loginCredsENC}${NOct}\n"

if _WaitForYESorNO_ "\nWould you like to test the current login credentials?"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater

## v1.6.1
## 2026-Apr-05
## 2026-Apr-08

## WebUI:
![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e)
Expand Down