diff --git a/extras/vpnupgrade_Libreswan.sh b/extras/vpnupgrade_Libreswan.sh index d8263e9..1f4f4dd 100644 --- a/extras/vpnupgrade_Libreswan.sh +++ b/extras/vpnupgrade_Libreswan.sh @@ -72,6 +72,7 @@ cat <<'EOF' IMPORTANT: Workaround required for Debian 7 (Wheezy). First, run the script at: https://git.io/vpndebian7 Continue only after completing this workaround. + EOF fi diff --git a/vpnsetup.sh b/vpnsetup.sh index 252de36..4278606 100755 --- a/vpnsetup.sh +++ b/vpnsetup.sh @@ -80,6 +80,18 @@ if [ -z "$VPN_IPSEC_PSK" ] || [ -z "$VPN_USER" ] || [ -z "$VPN_PASSWORD" ]; then exit 1 fi +if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then +cat <<'EOF' +IMPORTANT: Workaround required for Debian 7 (Wheezy). +First, run the script at: https://git.io/vpndebian7 +If not already done so, press Ctrl-C to interrupt now. + +Pausing for 60 seconds... + +EOF +sleep 60 +fi + echo "VPN setup in progress... Please be patient." echo @@ -95,18 +107,6 @@ apt-get -yqq update apt-get -yq install wget dnsutils openssl apt-get -yq install iproute gawk grep sed net-tools -if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then -cat <<'EOF' - -IMPORTANT: Workaround required for Debian 7 (Wheezy). -First, run the script at: https://git.io/vpndebian7 -If not already done so, press Ctrl-C to interrupt. - -Pausing for 60 seconds... -EOF -sleep 60 -fi - cat <<'EOF' Trying to auto discover IPs of this server...