From 8611fc0df544c119ab6b6c8fd67612d05804cbe8 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 30 Jul 2012 12:39:12 -0700 Subject: [PATCH] Use explicit paths --- CU2/check-hijacking.sh | 2 ++ CU2/check-local-dns.sh | 2 +- CU2/check-network-change.sh | 2 +- CU2/common.inc | 4 +++- CU2/handle-control-change.sh | 2 +- CU2/handle-network-change.sh | 3 +-- CU2/set-dns-to-dhcp.sh | 2 ++ CU2/set-dns.sh | 2 ++ CU2/start-dnscrypt-proxy.sh | 2 +- CU2/stop-dnscrypt-proxy.sh | 2 +- CU2/switch-to-dhcp.sh | 2 +- CU2/switch-to-dnscrypt.sh | 2 +- 12 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CU2/check-hijacking.sh b/CU2/check-hijacking.sh index 96359aa..9baed64 100755 --- a/CU2/check-hijacking.sh +++ b/CU2/check-hijacking.sh @@ -1,5 +1,7 @@ #! /bin/sh +. ./common.inc + try_resolution() { exec alarmer 5 dig +tries=2 +time=3 +short resolver1.opendns.com \ | egrep '^208[.]67[.]' > /dev/null 2>&1 diff --git a/CU2/check-local-dns.sh b/CU2/check-local-dns.sh index 4771d59..b929c54 100755 --- a/CU2/check-local-dns.sh +++ b/CU2/check-local-dns.sh @@ -1,6 +1,6 @@ #! /bin/sh -. common.inc +. ./common.inc try_local_resolution() { exec dig +tries=2 +time=3 +short resolver1.opendns.com @$INTERFACE_PROXY \ diff --git a/CU2/check-network-change.sh b/CU2/check-network-change.sh index 03b7c67..5111bd9 100755 --- a/CU2/check-network-change.sh +++ b/CU2/check-network-change.sh @@ -1,7 +1,7 @@ #! /bin/ksh # /Library/Preferences/SystemConfiguration -. common.inc +. ./common.inc NETWORK_STATE_FILE="${STATES_DIR}/network-state" DHCP_DNS_FILE="${STATES_DIR}/dhcp-dns" diff --git a/CU2/common.inc b/CU2/common.inc index 41184d4..ae59759 100644 --- a/CU2/common.inc +++ b/CU2/common.inc @@ -1,6 +1,8 @@ DNSCRYPT_BASE_DIR='/Library/Application Support/DNSCrypt' +cd -- "${DNSCRYPT_BASE_DIR}/scripts" || exit 1 + CONTROL_DIR="${DNSCRYPT_BASE_DIR}/control" DNSCRYPT_PROXY_BASE_DIR="${DNSCRYPT_BASE_DIR}/dnscrypt-proxy" PROXY_PID_FILE="${DNSCRYPT_PROXY_BASE_DIR}/dnscrypt-proxy.pid" @@ -15,7 +17,7 @@ INTERFACE_PROXY_MASK="24" INTERFACE_PROBES="127.0.0.55" INTERFACE_PROBES_MASK="24" -export PATH="${DNSCRYPT_BASE_DIR/bin}:${DNSCRYPT_BASE_DIR/scripts}:$PATH" +export PATH="${DNSCRYPT_BASE_DIR}/bin:${DNSCRYPT_BASE_DIR}/scripts:$PATH" init_interfaces() { sudo ifconfig lo0 alias ${INTERFACE_UNBOUND}/${INTERFACE_UNBOUND_MASK} diff --git a/CU2/handle-control-change.sh b/CU2/handle-control-change.sh index 88b5bc6..7ac4d8f 100755 --- a/CU2/handle-control-change.sh +++ b/CU2/handle-control-change.sh @@ -1,6 +1,6 @@ #! /bin/sh -. common.inc +. ./common.inc if [ -e "$DNSCRYPT_FILE" ]; then exec ./switch-to-dnscrypt.sh diff --git a/CU2/handle-network-change.sh b/CU2/handle-network-change.sh index 03a5a7c..22ad880 100755 --- a/CU2/handle-network-change.sh +++ b/CU2/handle-network-change.sh @@ -1,13 +1,12 @@ #! /bin/sh -. common.inc +. ./common.inc FALLBACK_FILE="${CONTROL_DIR}/fallback" [ ! -e "$FALLBACK_FILE" ] && exit 0 ./check-network-change.sh || exit 0 ./check-hijacking.sh && exit 0 - [ ! -e "$DNSCRYPT_FILE" ] && exit 0 ./set-dns-to-dhcp.sh ./switch-to-dnscrypt.sh diff --git a/CU2/set-dns-to-dhcp.sh b/CU2/set-dns-to-dhcp.sh index fb4a1cd..ea241a0 100755 --- a/CU2/set-dns-to-dhcp.sh +++ b/CU2/set-dns-to-dhcp.sh @@ -1,5 +1,7 @@ #! /bin/sh +. ./common.inc + exec networksetup -listallnetworkservices 2>/dev/null | \ fgrep -v '*' | while read x ; do networksetup -setdnsservers "$x" empty diff --git a/CU2/set-dns.sh b/CU2/set-dns.sh index e280ce6..68df12b 100755 --- a/CU2/set-dns.sh +++ b/CU2/set-dns.sh @@ -1,5 +1,7 @@ #! /bin/sh +. ./common.inc + servers="$*" [ $# -lt 1 ] && exit 1 diff --git a/CU2/start-dnscrypt-proxy.sh b/CU2/start-dnscrypt-proxy.sh index c00dff2..6f60609 100755 --- a/CU2/start-dnscrypt-proxy.sh +++ b/CU2/start-dnscrypt-proxy.sh @@ -1,6 +1,6 @@ #! /bin/sh -. common.inc +. ./common.inc FAMILYSHIELD_FILE="${CONTROL_DIR}/familyshield" diff --git a/CU2/stop-dnscrypt-proxy.sh b/CU2/stop-dnscrypt-proxy.sh index cb9f8c0..211e631 100755 --- a/CU2/stop-dnscrypt-proxy.sh +++ b/CU2/stop-dnscrypt-proxy.sh @@ -1,6 +1,6 @@ #! /bin/sh -. common.inc +. ./common.inc pgrep -x dnscrypt-proxy | egrep '[0-9]+' > /dev/null || exit 0 [ ! -r "$PROXY_PID_FILE" ] && exit 0 diff --git a/CU2/switch-to-dhcp.sh b/CU2/switch-to-dhcp.sh index 4d6f85b..3716de0 100755 --- a/CU2/switch-to-dhcp.sh +++ b/CU2/switch-to-dhcp.sh @@ -1,6 +1,6 @@ #! /bin/sh -. common.inc +. ./common.inc [ -e "$DNSCRYPT_FILE" ] && exit 0 diff --git a/CU2/switch-to-dnscrypt.sh b/CU2/switch-to-dnscrypt.sh index b12b13c..27ebd2f 100755 --- a/CU2/switch-to-dnscrypt.sh +++ b/CU2/switch-to-dnscrypt.sh @@ -1,6 +1,6 @@ #! /bin/ksh -. common.inc +. ./common.inc PAUSE_MAX=10 PAUSE_INCREMENT=0.1