From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Wed, 16 May 2018 17:19:48 +0000 (+0200)
Subject: wg-quick: use invoking shell in auto rooting
X-Git-Tag: v1.0.20191226~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe9bc71e40a134ba37c7ff0cafda9f22b1fc3c63;p=thirdparty%2Fwireguard-tools.git

wg-quick: use invoking shell in auto rooting

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

diff --git a/src/wg-quick/darwin.bash b/src/wg-quick/darwin.bash
index 0eef3d9..581954c 100755
--- a/src/wg-quick/darwin.bash
+++ b/src/wg-quick/darwin.bash
@@ -9,6 +9,7 @@ shopt -s extglob
 export LC_ALL=C
 
 SELF="${BASH_SOURCE[0]}"
+[[ $SELF == */* ]] || SELF="./$SELF"
 SELF="$(cd "${SELF%/*}" && pwd -P)/${SELF##*/}"
 export PATH="${SELF%/*}:$PATH"
 
@@ -82,7 +83,7 @@ read_bool() {
 }
 
 auto_su() {
-	[[ $UID == 0 ]] || exec sudo -p "$PROGRAM must be run as root. Please enter the password for %u to continue: " "$SELF" "${ARGS[@]}"
+	[[ $UID == 0 ]] || exec sudo -p "$PROGRAM must be run as root. Please enter the password for %u to continue: " -- "$BASH" -- "$SELF" "${ARGS[@]}"
 }
 
 get_real_interface() {
diff --git a/src/wg-quick/linux.bash b/src/wg-quick/linux.bash
index 9139e7f..3f1976b 100755
--- a/src/wg-quick/linux.bash
+++ b/src/wg-quick/linux.bash
@@ -79,7 +79,7 @@ read_bool() {
 }
 
 auto_su() {
-	[[ $UID == 0 ]] || exec sudo -p "$PROGRAM must be run as root. Please enter the password for %u to continue: " "$SELF" "${ARGS[@]}"
+	[[ $UID == 0 ]] || exec sudo -p "$PROGRAM must be run as root. Please enter the password for %u to continue: " -- "$BASH" -- "$SELF" "${ARGS[@]}"
 }
 
 add_if() {