Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Address sticklr complaints

Browse source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2020-05-25 17:49:19 +01:00
parent af1129fc28
commit acf2879057
No known key found for this signature in database
GPG key ID: 872950F3ECF2B173
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
automated install/basic-install.sh
View file

@ -184,17 +184,17 @@ os_check() {
display_warning=true display_warning=true
detected_os_pretty=$(cat /etc/*release | grep PRETTY_NAME | cut -d '=' -f2- | tr -d '"') detected_os_pretty=$(cat /etc/*release | grep PRETTY_NAME | cut -d '=' -f2- | tr -d '"')
detected_os=$(echo "${detected_os_pretty}" | sed 's/ .*//') 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') mapfile -t supportedOS < <(dig +short -t txt ${remote_os_domain} | tr -d '"' | tr ' ' '\n')
for i in "${supportedOS[@]}" for i in "${supportedOS[@]}"
do do
os_part=$(echo $i | cut -d '=' -f1) os_part=$(echo "$i" | cut -d '=' -f1)
versions_part=$(echo $i | cut -d '=' -f2-) versions_part=$(echo "$i" | cut -d '=' -f2-)
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') mapfile -t supportedVer < <(echo "${versions_part}" | tr ',' '\n')
for x in "${supportedVer[@]}" for x in "${supportedVer[@]}"