1
0
mirror of synced 2025-01-31 04:21:43 +03:00

Minor changes in wording

This commit is contained in:
hwdsl2 2016-01-19 01:23:17 -06:00
parent 49f8eb28e6
commit 7ca9723e45
4 changed files with 12 additions and 24 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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