snow/wireguard-tools
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

wg-quick: darwin: bash correctness

Browse source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-05-16 02:17:33 +02:00
parent f64f0cc740
commit 9c18c70da6
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/wg-quick/darwin.bash
View file

@ -204,12 +204,12 @@ set_endpoint_direct_route() {
if [[ $remove_all_old -eq 1 ]]; then if [[ $remove_all_old -eq 1 ]]; then
for endpoint in "${ENDPOINTS[@]}"; do for endpoint in "${ENDPOINTS[@]}"; do
[[ " ${old_endpoints[*]} " == *"$endpoint"* ]] || old_endpoints+=( "$endpoint" ) [[ " ${old_endpoints[*]} " == *" $endpoint "* ]] || old_endpoints+=( "$endpoint" )
done done
fi fi
for endpoint in "${old_endpoints[@]}"; do 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 if [[ $endpoint == *:* ]]; then
cmd route -q delete -inet6 "$endpoint" >/dev/null 2>&1 || true cmd route -q delete -inet6 "$endpoint" >/dev/null 2>&1 || true
else else
@ -218,7 +218,7 @@ set_endpoint_direct_route() {
done done
for endpoint in "${ENDPOINTS[@]}"; do 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" ) added+=( "$endpoint" )
continue continue
fi fi
@ -240,9 +240,7 @@ set_dns() {
# want DNS via DHCP when setting this back to "empty". Because macOS is # 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 # so horrible to deal with here, we'll simply wait for irate users to
# provide a patch themselves. # provide a patch themselves.
local service response local service response
{ read -r _; while read -r service; do { read -r _; while read -r service; do
[[ $service == "*"* ]] && service="${service:1}" [[ $service == "*"* ]] && service="${service:1}"
while read -r response; do while read -r response; do
@ -252,6 +250,7 @@ set_dns() {
} }
del_dns() { del_dns() {
local service response
{ read -r _; while read -r service; do { read -r _; while read -r service; do
[[ $service == "*"* ]] && service="${service:1}" [[ $service == "*"* ]] && service="${service:1}"
while read -r response; do while read -r response; do