]> git.ipfire.org Git - thirdparty/wireguard-tools.git/commitdiff
wg-quick: darwin: bash correctness
authorJason A. Donenfeld <Jason@zx2c4.com>
Wed, 16 May 2018 00:17:33 +0000 (02:17 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Wed, 16 May 2018 02:05:04 +0000 (04:05 +0200)
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
src/wg-quick/darwin.bash

index ca7e901b9de171dbb39c83265af76a08eeb54b4a..5c25961ccde1b341e8e2ae556a4ccc69e29a133b 100755 (executable)
@@ -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