Skip to content

Commit 323eaa5

Browse files
Merge pull request #590 from Martinski4GitHub/dev
Fix for Password with Special Chars
2 parents 72473f8 + fe3155f commit 323eaa5

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎MerlinAU.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
#
55
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
66
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
7-
# Last Modified: 2026-Jul-30
7+
# Last Modified: 2026-Aug-16
88
###################################################################
99
set -u
1010

1111
## Set version for each Production Release ##
1212
readonly SCRIPT_VERSION=1.6.6
13-
readonly SCRIPT_VERSTAG="26073018"
13+
readonly SCRIPT_VERSTAG="26081603"
1414
readonly SCRIPT_NAME="MerlinAU"
1515
## Set to "master" for Production Releases ##
1616
SCRIPT_BRANCH="dev"
@@ -1648,7 +1648,7 @@ Get_Custom_Setting()
16481648
}
16491649

16501650
##----------------------------------------##
1651-
## Modified by Martinski W. [2025-Jan-20] ##
1651+
## Modified by Martinski W. [2026-Aug-16] ##
16521652
##----------------------------------------##
16531653
Update_Custom_Settings()
16541654
{
@@ -1678,7 +1678,8 @@ Update_Custom_Settings()
16781678
then
16791679
if [ "$setting_value" != "$(grep "^$setting_type" "$CONFIG_FILE" | cut -f2 -d' ')" ]
16801680
then
1681-
sed -i "s/^$setting_type.*/$setting_type $setting_value/" "$CONFIG_FILE"
1681+
fixedVal="$(echo "$setting_value" | sed 's/[\/&]/\\&/g')"
1682+
sed -i "s/^${setting_type}.*/$setting_type $fixedVal/" "$CONFIG_FILE"
16821683
fi
16831684
else
16841685
echo "$setting_type $setting_value" >> "$CONFIG_FILE"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater
22

33
## v1.6.6
4-
## 2026-Jul-30
4+
## 2026-Aug-16
55

66
## WebUI:
77
<img width="775" height="1640" alt="image" src="https://github.com/user-attachments/assets/846f889b-b39f-4ffe-a37a-8892ad9b2f7f" />

0 commit comments

Comments
 (0)