From fc33e1c451d6e748580db384852023312569d8cf Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Thu, 19 Aug 2021 01:40:38 -0500 Subject: [PATCH] Cleanup --- extras/ikev2setup.sh | 2 +- extras/quickstart.sh | 2 +- extras/vpnupgrade.sh | 2 +- vpnsetup.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/ikev2setup.sh b/extras/ikev2setup.sh index 61efd90..1ad3c59 100755 --- a/extras/ikev2setup.sh +++ b/extras/ikev2setup.sh @@ -297,7 +297,7 @@ run_swan_update() { if ( set -x; wget -t 3 -T 30 -q -O "$TMPDIR/vpnup.sh" "$update_url"; ); then ( set -x - /bin/sh "$TMPDIR/vpnup.sh" + /bin/bash "$TMPDIR/vpnup.sh" ) else echo "Error: Could not download update script." >&2 diff --git a/extras/quickstart.sh b/extras/quickstart.sh index cebd4a4..0bc76c9 100755 --- a/extras/quickstart.sh +++ b/extras/quickstart.sh @@ -159,7 +159,7 @@ run_setup() { if [ -d "$TMPDIR" ]; then if ( set -x; wget -t 3 -T 30 -q -O "$TMPDIR/vpn.sh" "$setup_url" \ || curl -fsL "$setup_url" -o "$TMPDIR/vpn.sh" 2>/dev/null ); then - if /bin/sh "$TMPDIR/vpn.sh"; then + if /bin/bash "$TMPDIR/vpn.sh"; then if [ -s /opt/src/ikev2.sh ] && [ ! -f /etc/ipsec.d/ikev2.conf ]; then sleep 1 /bin/bash /opt/src/ikev2.sh --auto || status=1 diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh index 51a4e19..437d217 100755 --- a/extras/vpnupgrade.sh +++ b/extras/vpnupgrade.sh @@ -142,7 +142,7 @@ run_setup() { if [ -d "$TMPDIR" ]; then if ( set -x; wget -t 3 -T 30 -q -O "$TMPDIR/vpnup.sh" "$setup_url" \ || curl -fsL "$setup_url" -o "$TMPDIR/vpnup.sh" 2>/dev/null ); then - VPN_UPDATE_SWAN_VER="$SWAN_VER" /bin/sh "$TMPDIR/vpnup.sh" || status=1 + VPN_UPDATE_SWAN_VER="$SWAN_VER" /bin/bash "$TMPDIR/vpnup.sh" || status=1 else status=1 echo "Error: Could not download update script." >&2 diff --git a/vpnsetup.sh b/vpnsetup.sh index d13d795..7aa7453 100755 --- a/vpnsetup.sh +++ b/vpnsetup.sh @@ -218,7 +218,7 @@ run_setup() { VPN_L2TP_LOCAL="$VPN_L2TP_LOCAL" VPN_L2TP_POOL="$VPN_L2TP_POOL" \ VPN_XAUTH_NET="$VPN_XAUTH_NET" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ - /bin/sh "$TMPDIR/vpn.sh" || status=1 + /bin/bash "$TMPDIR/vpn.sh" || status=1 else status=1 echo "Error: Could not download VPN setup script." >&2