diff options
| -rwxr-xr-x | src/tools/wg-quick/darwin.bash | 26 | ||||
| -rwxr-xr-x | src/tools/wg-quick/linux.bash | 20 |
2 files changed, 23 insertions, 23 deletions
diff --git a/src/tools/wg-quick/darwin.bash b/src/tools/wg-quick/darwin.bash index ba1e49b..4a3240c 100755 --- a/src/tools/wg-quick/darwin.bash +++ b/src/tools/wg-quick/darwin.bash @@ -1,11 +1,9 @@ -#!/usr/local/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: GPL-2.0 # # Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. # -# The shebang is in /usr/local because this requires bash 4. - set -e -o pipefail shopt -s extglob export LC_ALL=C @@ -29,6 +27,18 @@ CONFIG_FILE="" PROGRAM="${0##*/}" ARGS=( "$@" ) +cmd() { + echo "[#] $*" >&2 + "$@" +} + +die() { + echo "$PROGRAM: $*" >&2 + exit 1 +} + +[[ ${BASH_VERSINFO[0]} -ge 4 ]] || die "Version mismatch: bash ${BASH_VERSINFO[0]} detected, when bash 4+ required" + parse_options() { local interface_section=0 line key value stripped CONFIG_FILE="$1" @@ -71,16 +81,6 @@ read_bool() { esac } -cmd() { - echo "[#] $*" >&2 - "$@" -} - -die() { - echo "$PROGRAM: $*" >&2 - exit 1 -} - auto_su() { [[ $UID == 0 ]] || exec sudo -p "$PROGRAM must be run as root. Please enter the password for %u to continue: " "$SELF" "${ARGS[@]}" } diff --git a/src/tools/wg-quick/linux.bash b/src/tools/wg-quick/linux.bash index cd66b4d..38ccad2 100755 --- a/src/tools/wg-quick/linux.bash +++ b/src/tools/wg-quick/linux.bash @@ -26,6 +26,16 @@ CONFIG_FILE="" PROGRAM="${0##*/}" ARGS=( "$@" ) +cmd() { + echo "[#] $*" >&2 + "$@" +} + +die() { + echo "$PROGRAM: $*" >&2 + exit 1 +} + parse_options() { local interface_section=0 line key value stripped CONFIG_FILE="$1" @@ -68,16 +78,6 @@ read_bool() { esac } -cmd() { - echo "[#] $*" >&2 - "$@" -} - -die() { - echo "$PROGRAM: $*" >&2 - exit 1 -} - auto_su() { [[ $UID == 0 ]] || exec sudo -p "$PROGRAM must be run as root. Please enter the password for %u to continue: " "$SELF" "${ARGS[@]}" } |