1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00

read > mapfile as suggested by @dschaper

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2020-06-05 21:01:53 +01:00
parent 58724a38a9
commit 03a8cff55e
No known key found for this signature in database
GPG Key ID: 872950F3ECF2B173

View File

@ -405,7 +405,7 @@ os_check() {
detected_os="${detected_os_pretty%% *}" detected_os="${detected_os_pretty%% *}"
detected_version=$(cat /etc/*release | grep VERSION_ID | cut -d '=' -f2- | tr -d '"') detected_version=$(cat /etc/*release | grep VERSION_ID | cut -d '=' -f2- | tr -d '"')
mapfile -t supportedOS < <(dig +short -t txt ${remote_os_domain} | tr -d '"' | tr ' ' '\n') IFS=" "; read -r -a supportedOS < <(dig +short -t txt ${remote_os_domain} | tr -d '"')
for i in "${supportedOS[@]}" for i in "${supportedOS[@]}"
do do
@ -414,7 +414,7 @@ os_check() {
if [[ "${detected_os}" =~ ${os_part} ]]; then if [[ "${detected_os}" =~ ${os_part} ]]; then
valid_os=true valid_os=true
mapfile -t supportedVer < <(echo "${versions_part}" | tr ',' '\n') IFS=","; read -r -a supportedVer <<<"${versions_part}"
for x in "${supportedVer[@]}" for x in "${supportedVer[@]}"
do do
if [[ "${detected_version}" =~ $x ]];then if [[ "${detected_version}" =~ $x ]];then