Amend previous commit

* add -q in grep statement to make sure the console stays clean
* redo check for noidnout by also using the help function of dig
This commit is contained in:
Dirk 2021-09-01 18:44:28 +02:00
parent f8a87315cf
commit bc742e0ea4

View File

@ -20116,7 +20116,7 @@ check_resolver_bins() {
type -p idn2 &>/dev/null && HAS_IDN2=true type -p idn2 &>/dev/null && HAS_IDN2=true
# Old dig versions don't have an option to ignore $HOME/.digrc # Old dig versions don't have an option to ignore $HOME/.digrc
if ! dig -h | grep -E '\-r.*~/.digrc'; then if ! dig -h | grep -qE '\-r.*~/.digrc'; then
HAS_DIG_R=false HAS_DIG_R=false
DIG_R="" DIG_R=""
fi fi
@ -20124,9 +20124,7 @@ check_resolver_bins() {
fatal "Neither \"dig\", \"host\", \"drill\" or \"nslookup\" is present" $ERR_DNSBIN fatal "Neither \"dig\", \"host\", \"drill\" or \"nslookup\" is present" $ERR_DNSBIN
fi fi
if "$HAS_DIG"; then if "$HAS_DIG"; then
if dig $DIG_R +noidnout -t a invalid. 2>&1 | grep -Eq 'Invalid option: \+noidnout|IDN support not enabled'; then if dig -h | grep -Eq idnout; then
:
else
HAS_DIG_NOIDNOUT=true HAS_DIG_NOIDNOUT=true
fi fi
fi fi