diff --git a/vpnsetup.sh b/vpnsetup.sh index e3db449..d526dcb 100644 --- a/vpnsetup.sh +++ b/vpnsetup.sh @@ -39,8 +39,8 @@ if [ "$(lsb_release -si 2>/dev/null)" != "Ubuntu" ] && [ "$(lsb_release -si 2>/d fi if [ -f "/proc/user_beancounters" ]; then - echo "Sorry, this script does NOT support OpenVZ VPS. Try Nyr's OpenVPN script instead:" - echo "https://github.com/Nyr/openvpn-install" + echo "This script does NOT support OpenVZ VPS." + echo "Try Nyr's OpenVPN script instead: https://github.com/Nyr/openvpn-install" exit 1 fi @@ -51,7 +51,7 @@ fi # Check for empty VPN variables if [ -z "$IPSEC_PSK" ] || [ -z "$VPN_USER" ] || [ -z "$VPN_PASSWORD" ]; then - echo "Sorry, the VPN credentials cannot be empty. Please re-edit the VPN script." + echo "The VPN credentials cannot be empty. Please re-edit the VPN script." exit 1 fi diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh index 520fce2..80c4c8b 100644 --- a/vpnsetup_centos.sh +++ b/vpnsetup_centos.sh @@ -38,18 +38,18 @@ if [ ! -f /etc/redhat-release ]; then fi if ! grep -qs -e "release 6" -e "release 7" /etc/redhat-release; then - echo "Sorry, this script only supports versions 6 and 7 of CentOS/RHEL." + echo "This script only supports versions 6 and 7 of CentOS/RHEL." exit 1 fi if [ "$(uname -m)" != "x86_64" ]; then - echo "Sorry, this script only supports 64-bit CentOS/RHEL." + echo "This script only supports 64-bit CentOS/RHEL." exit 1 fi if [ -f "/proc/user_beancounters" ]; then - echo "Sorry, this script does NOT support OpenVZ VPS. Try Nyr's OpenVPN script instead:" - echo "https://github.com/Nyr/openvpn-install" + echo "This script does NOT support OpenVZ VPS." + echo "Try Nyr's OpenVPN script instead: https://github.com/Nyr/openvpn-install" exit 1 fi @@ -60,7 +60,7 @@ fi # Check for empty VPN variables if [ -z "$IPSEC_PSK" ] || [ -z "$VPN_USER" ] || [ -z "$VPN_PASSWORD" ]; then - echo "Sorry, the VPN credentials cannot be empty. Please re-edit the VPN script." + echo "The VPN credentials cannot be empty. Please re-edit the VPN script." exit 1 fi diff --git a/vpnupgrade_Libreswan.sh b/vpnupgrade_Libreswan.sh index 09c783d..30a2976 100644 --- a/vpnupgrade_Libreswan.sh +++ b/vpnupgrade_Libreswan.sh @@ -18,12 +18,6 @@ if [ "$(lsb_release -si 2>/dev/null)" != "Ubuntu" ] && [ "$(lsb_release -si 2>/d exit 1 fi -if [ -f "/proc/user_beancounters" ]; then - echo "Sorry, this script does NOT support OpenVZ VPS. Try Nyr's OpenVPN script instead:" - echo "https://github.com/Nyr/openvpn-install" - exit 1 -fi - if [ "$(id -u)" != 0 ]; then echo "Sorry, you need to run this script as root." exit 1 @@ -31,7 +25,7 @@ fi /usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan" if [ "$?" != "0" ]; then - echo "This upgrade script requires that you already have Libreswan installed." + echo "This upgrade script requires you already have Libreswan installed." echo "Aborting." exit 1 fi diff --git a/vpnupgrade_Libreswan_centos.sh b/vpnupgrade_Libreswan_centos.sh index 138d0c0..d31fe21 100644 --- a/vpnupgrade_Libreswan_centos.sh +++ b/vpnupgrade_Libreswan_centos.sh @@ -19,18 +19,12 @@ if [ ! -f /etc/redhat-release ]; then fi if ! grep -qs -e "release 6" -e "release 7" /etc/redhat-release; then - echo "Sorry, this script only supports versions 6 and 7 of CentOS/RHEL." + echo "This script only supports versions 6 and 7 of CentOS/RHEL." exit 1 fi if [ "$(uname -m)" != "x86_64" ]; then - echo "Sorry, this script only supports 64-bit CentOS/RHEL." - exit 1 -fi - -if [ -f "/proc/user_beancounters" ]; then - echo "Sorry, this script does NOT support OpenVZ VPS. Try Nyr's OpenVPN script instead:" - echo "https://github.com/Nyr/openvpn-install" + echo "This script only supports 64-bit CentOS/RHEL." exit 1 fi @@ -41,7 +35,7 @@ fi /usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan" if [ "$?" != "0" ]; then - echo "This upgrade script requires that you already have Libreswan installed." + echo "This upgrade script requires you already have Libreswan installed." echo "Aborting." exit 1 fi