mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-12-23 21:30:17 +00:00
Merge pull request #2426 from mrmajik45/master
Read without -r will mangle backslashes. (Fix)
This commit is contained in:
commit
cedc39bf09
2 changed files with 3 additions and 3 deletions
|
@ -907,7 +907,7 @@ parse_file() {
|
|||
#shellcheck disable=SC2016
|
||||
IFS=$'\r\n' command eval 'file_info=( $(cat "${filename}") )'
|
||||
else
|
||||
read -a file_info <<< $filename
|
||||
read -a -r file_info <<< "$filename"
|
||||
fi
|
||||
# Set a named variable for better readability
|
||||
local file_lines
|
||||
|
|
|
@ -110,7 +110,7 @@ SetWebPassword() {
|
|||
# Prevents a bug if the user presses Ctrl+C and it continues to hide the text typed.
|
||||
# So we reset the terminal via stty if the user does press Ctrl+C
|
||||
trap '{ echo -e "\nNo password will be set" ; stty sane ; exit 1; }' INT
|
||||
read -s -p "Enter New Password (Blank for no password): " PASSWORD
|
||||
read -s -p -r "Enter New Password (Blank for no password): " PASSWORD
|
||||
echo ""
|
||||
|
||||
if [ "${PASSWORD}" == "" ]; then
|
||||
|
@ -119,7 +119,7 @@ SetWebPassword() {
|
|||
exit 0
|
||||
fi
|
||||
|
||||
read -s -p "Confirm Password: " CONFIRM
|
||||
read -s -p -r "Confirm Password: " CONFIRM
|
||||
echo ""
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue