arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-31 11:10:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3491 from pi-hole/fix_ip_address_section

Browse Source 
Fix fresh install on dev branch not working
This commit is contained in:
DL6ER 2020-06-21 21:58:36 +02:00 committed by GitHub
commit 2c3aa9ab00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
advanced/Scripts/piholeDebug.sh
View File

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

4
automated install/basic-install.sh
View File

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