From 901a346ffb138f5c35cc91ee2484c9f22bd5a2a2 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 16 May 2018 02:17:33 +0200 Subject: wg-quick: darwin: bash correctness --- src/tools/wg-quick/darwin.bash | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/tools/wg-quick/darwin.bash b/src/tools/wg-quick/darwin.bash index ca7e901..5c25961 100755 --- a/src/tools/wg-quick/darwin.bash +++ b/src/tools/wg-quick/darwin.bash @@ -204,12 +204,12 @@ set_endpoint_direct_route() { if [[ $remove_all_old -eq 1 ]]; then for endpoint in "${ENDPOINTS[@]}"; do - [[ " ${old_endpoints[*]} " == *"$endpoint"* ]] || old_endpoints+=( "$endpoint" ) + [[ " ${old_endpoints[*]} " == *" $endpoint "* ]] || old_endpoints+=( "$endpoint" ) done fi for endpoint in "${old_endpoints[@]}"; do - [[ $remove_all_old -eq 0 && " ${ENDPOINTS[*]} " == *"$endpoint"* ]] && continue + [[ $remove_all_old -eq 0 && " ${ENDPOINTS[*]} " == *" $endpoint "* ]] && continue if [[ $endpoint == *:* ]]; then cmd route -q delete -inet6 "$endpoint" >/dev/null 2>&1 || true else @@ -218,7 +218,7 @@ set_endpoint_direct_route() { done for endpoint in "${ENDPOINTS[@]}"; do - if [[ $remove_all_old -eq 0 && " ${old_endpoints[*]} " == *"$endpoint"* ]]; then + if [[ $remove_all_old -eq 0 && " ${old_endpoints[*]} " == *" $endpoint "* ]]; then added+=( "$endpoint" ) continue fi @@ -240,9 +240,7 @@ set_dns() { # want DNS via DHCP when setting this back to "empty". Because macOS is # so horrible to deal with here, we'll simply wait for irate users to # provide a patch themselves. - local service response - { read -r _; while read -r service; do [[ $service == "*"* ]] && service="${service:1}" while read -r response; do @@ -252,6 +250,7 @@ set_dns() { } del_dns() { + local service response { read -r _; while read -r service; do [[ $service == "*"* ]] && service="${service:1}" while read -r response; do -- cgit v1.2.3-59-g8ed1b