Skip to content

Fix for 'Copy&Paste' into Password Entry #602

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
ExtremeFiretop merged 1 commit into from
Sep 17, 2026
Merged

Fix for 'Copy&Paste' into Password Entry #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# Project Created: 2023-Oct-01 by @ExtremeFiretop
# Official Co-Author: @Martinski W. since 2023-Nov-01
# Last Modified: 2026-Sep-03
# Last Modified: 2026-Sep-17
#
# MerlinAU™ / MerlinAutoUpdate™
# Official project: https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router
Expand All @@ -19,11 +19,11 @@
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.6.8
readonly SCRIPT_VERSTAG="26090718"
readonly SCRIPT_VERSION=1.6.9
readonly SCRIPT_VERSTAG="26091700"
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="master"
SCRIPT_BRANCH="dev"

##----------------------------------------##
## Modified by Martinski W. [2024-Jul-03] ##
Expand Down Expand Up @@ -4647,7 +4647,7 @@ _GetRawKeypress_()
fi
local savedSettings="$(stty -g)"
stty -icanon -echo
dd bs=4 count=1 2>/dev/null
dd bs=64 count=1 2>/dev/null
stty "$savedSettings"
stty -echo
}
Expand Down Expand Up @@ -4774,6 +4774,7 @@ _GetKeypressInput_()
inputString=""
inputStrLen=0
keypressCnt=0
keypressLen=0
prevxStrLen=0
_ClearKeySeqState_
_ShowInputString_
Expand All @@ -4782,7 +4783,8 @@ _GetKeypressInput_()
do
theChar="$(_GetRawKeypress_)"
charNum="$(printf "%d" "'$theChar")"
keypressCnt="$((keypressCnt + 1))"
keypressLen="${#theChar}"
keypressCnt="$((keypressCnt + keypressLen))"

##<ENTER>##
if echo "$charNum" | grep -qE "^(0|10|13)$"
Expand Down Expand Up @@ -4980,6 +4982,7 @@ _GetPasswordInput_()
charNum=""
showPSWD=0
keypressCnt=0
keypressLen=0
prevxStrLen=0
newPSWDstring="$thePWSDstring"
newPSWDlength="${#newPSWDstring}"
Expand All @@ -4990,7 +4993,8 @@ _GetPasswordInput_()
do
theChar="$(_GetRawKeypress_)"
charNum="$(printf "%d" "'$theChar")"
keypressCnt="$((keypressCnt + 1))"
keypressLen="${#theChar}"
keypressCnt="$((keypressCnt + keypressLen))"

##<ENTER>##
if echo "$charNum" | grep -qE "^(0|10|13)$"
Expand Down Expand Up @@ -6140,8 +6144,8 @@ _CheckOnlineFirmwareSHA256_()
return 1
fi

checksumSource="FwUpdate VPS mirror"
Say "${MGNTct}*WARNING*${NOct}: Using the FwUpdate VPS checksum mirror for verification."
checksumSource="RMerlin's F/W Update VPS mirror"
Say "${MGNTct}*WARNING*${NOct}: Using RMerlin's F/W Update VPS checksum mirror for verification."
fi

#--------------------------------------------------------------------------#
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,7 +1,7 @@
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater

## v1.6.8
## 2026-Sep-07
## v1.6.9
## 2026-Sep-17

## WebUI:
<img width="775" height="1640" alt="image" src="https://github.com/user-attachments/assets/846f889b-b39f-4ffe-a37a-8892ad9b2f7f" />
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.8
1.6.9