From f9e71bee0a29b44a8586595e998ad6b878ba3ac6 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Mon, 12 Nov 2018 17:15:24 -0800 Subject: [PATCH 1/2] Account for port, or lack of, in PIHOLE_DNS_1 Signed-off-by: Dan Schaper --- gravity.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gravity.sh b/gravity.sh index 2b3ffcd8..d9fe2209 100755 --- a/gravity.sh +++ b/gravity.sh @@ -257,7 +257,13 @@ gravity_DownloadBlocklistFromUrl() { esac if [[ "${blocked}" == true ]]; then - ip=$(dig "@${PIHOLE_DNS_1}" +short "${domain}") + printf -v ip_addr "%s" ${PIHOLE_DNS_1%#*} + if [[ ${PIHOLE_DNS_1} != *"#"* ]]; then + port=53 + else + printf -v port "%s" ${PIHOLE_DNS_1#*#} + fi + ip=$(dig "@${ip_addr}" -p "${port}" +short "${domain}") if [[ $(echo "${url}" | awk -F '://' '{print $1}') = "https" ]]; then port=443; else port=80 From 5c621fa2535416e5586adb061ea081f8f611b761 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Mon, 12 Nov 2018 17:21:34 -0800 Subject: [PATCH 2/2] Lints Signed-off-by: Dan Schaper --- gravity.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gravity.sh b/gravity.sh index d9fe2209..288fd237 100755 --- a/gravity.sh +++ b/gravity.sh @@ -257,11 +257,11 @@ gravity_DownloadBlocklistFromUrl() { esac if [[ "${blocked}" == true ]]; then - printf -v ip_addr "%s" ${PIHOLE_DNS_1%#*} + printf -v ip_addr "%s" "${PIHOLE_DNS_1%#*}" if [[ ${PIHOLE_DNS_1} != *"#"* ]]; then port=53 else - printf -v port "%s" ${PIHOLE_DNS_1#*#} + printf -v port "%s" "${PIHOLE_DNS_1#*#}" fi ip=$(dig "@${ip_addr}" -p "${port}" +short "${domain}") if [[ $(echo "${url}" | awk -F '://' '{print $1}') = "https" ]]; then