|
|
|
@ -183,7 +183,8 @@ os_check() {
|
|
|
|
|
detected_os=$(grep '^ID=' /etc/os-release | cut -d '=' -f2 | tr -d '"')
|
|
|
|
|
detected_version=$(grep VERSION_ID /etc/os-release | cut -d '=' -f2 | tr -d '"')
|
|
|
|
|
|
|
|
|
|
cmdResult="$(dig +short -t txt "${remote_os_domain}" @ns1.pi-hole.net 2>&1; echo $?)"
|
|
|
|
|
# Test via IPv4
|
|
|
|
|
cmdResult="$(dig -4 +short -t txt "${remote_os_domain}" @ns1.pi-hole.net 2>&1; echo $?)"
|
|
|
|
|
# Gets the return code of the previous command (last line)
|
|
|
|
|
digReturnCode="${cmdResult##*$'\n'}"
|
|
|
|
|
|
|
|
|
@ -195,8 +196,34 @@ os_check() {
|
|
|
|
|
# If the value of ${response} is a single 0, then this is the return code, not an actual response.
|
|
|
|
|
if [ "${response}" == 0 ]; then
|
|
|
|
|
valid_response=false
|
|
|
|
|
else
|
|
|
|
|
valid_response=true
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Try again via IPv6
|
|
|
|
|
if [ "$valid_response" = false ]; then
|
|
|
|
|
unset valid_response
|
|
|
|
|
|
|
|
|
|
cmdResult="$(dig -6 +short -t txt "${remote_os_domain}" @ns1.pi-hole.net 2>&1; echo $?)"
|
|
|
|
|
# Gets the return code of the previous command (last line)
|
|
|
|
|
digReturnCode="${cmdResult##*$'\n'}"
|
|
|
|
|
|
|
|
|
|
if [ ! "${digReturnCode}" == "0" ]; then
|
|
|
|
|
valid_response=false
|
|
|
|
|
else
|
|
|
|
|
# Dig returned 0 (success), so get the actual response, and loop through it to determine if the detected variables above are valid
|
|
|
|
|
response="${cmdResult%%$'\n'*}"
|
|
|
|
|
# If the value of ${response} is a single 0, then this is the return code, not an actual response.
|
|
|
|
|
if [ "${response}" == 0 ]; then
|
|
|
|
|
valid_response=false
|
|
|
|
|
else
|
|
|
|
|
valid_response=true
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ "$valid_response" = true ]; then
|
|
|
|
|
IFS=" " read -r -a supportedOS < <(echo "${response}" | tr -d '"')
|
|
|
|
|
for distro_and_versions in "${supportedOS[@]}"
|
|
|
|
|
do
|
|
|
|
@ -219,7 +246,7 @@ os_check() {
|
|
|
|
|
done
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ "$valid_os" = true ] && [ "$valid_version" = true ] && [ ! "$valid_response" = false ]; then
|
|
|
|
|
if [ "$valid_os" = true ] && [ "$valid_version" = true ] && [ "$valid_response" = true ]; then
|
|
|
|
|
display_warning=false
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|