wg-quick: make darwin and freebsd path search strict like linux

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/src/wg-quick/darwin.bash b/src/wg-quick/darwin.bash
index aa3edeb9ac0400d0d2bf55b0f280b4dc1b957b23..a2b378912a3a0eeed088412dfa5f4c86dde4681a 100755 (executable)
--- a/src/wg-quick/darwin.bash
+++ b/src/wg-quick/darwin.bash
@@ -47,7 +47,8 @@ parse_options() {
        CONFIG_FILE="$1"
        if [[ $CONFIG_FILE =~ ^[a-zA-Z0-9_=+.-]{1,15}$ ]]; then
                for path in "${CONFIG_SEARCH_PATHS[@]}"; do
-                       [[ -e $path/$CONFIG_FILE.conf ]] && { CONFIG_FILE="$path/$CONFIG_FILE.conf"; break; }
+                       CONFIG_FILE="$path/$1.conf"
+                       [[ -e $CONFIG_FILE ]] && break
                done
        fi
        [[ -e $CONFIG_FILE ]] || die "\`$CONFIG_FILE' does not exist"

diff --git a/src/wg-quick/freebsd.bash b/src/wg-quick/freebsd.bash
index 72e0bd046ad0717b2e403a52666a218542ebacf5..a72353c7130458d5a4b6115ffab1e28b2cb3c6af 100755 (executable)
--- a/src/wg-quick/freebsd.bash
+++ b/src/wg-quick/freebsd.bash
@@ -64,7 +64,8 @@ parse_options() {
        CONFIG_FILE="$1"
        if [[ $CONFIG_FILE =~ ^[a-zA-Z0-9_=+.-]{1,15}$ ]]; then
                for path in "${CONFIG_SEARCH_PATHS[@]}"; do
-                       [[ -e $path/$CONFIG_FILE.conf ]] && { CONFIG_FILE="$path/$CONFIG_FILE.conf"; break; }
+                       CONFIG_FILE="$path/$1.conf"
+                       [[ -e $CONFIG_FILE ]] && break
                done
        fi
        [[ -e $CONFIG_FILE ]] || die "\`$CONFIG_FILE' does not exist"