mirror/setup-ipsec-vpn
1
0
Fork 0
mirror of synced 2025-04-03 05:13:29 +03:00
Code Issues Projects Releases Wiki Activity

Improve OS detection

Browse source
This commit is contained in:
hwdsl2 2021-04-20 00:09:00 -05:00
parent 28b02f28db
commit d90c6121b6
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
extras/ikev2setup.sh
View file

@ -37,15 +37,19 @@ check_run_as_root() {
check_os_type() { check_os_type() {
os_arch=$(uname -m | tr -dc 'A-Za-z0-9_-') os_arch=$(uname -m | tr -dc 'A-Za-z0-9_-')
if grep -qs -e "release 7" -e "release 8" /etc/redhat-release; then rh_file="/etc/redhat-release"
if grep -qs -e "release 7" -e "release 8" "$rh_file"; then
os_type=centos os_type=centos
if grep -qs "Red Hat" /etc/redhat-release; then if grep -qs "Red Hat" "$rh_file"; then
os_type=rhel os_type=rhel
fi fi
if grep -qs "release 7" /etc/redhat-release; then if grep -qs "release 7" "$rh_file"; then
os_ver=7 os_ver=7
elif grep -qs "release 8" /etc/redhat-release; then elif grep -qs "release 8" "$rh_file"; then
os_ver=8 os_ver=8
if grep -qi stream "$rh_file"; then
os_ver=8s
fi
fi fi
elif grep -qs "Amazon Linux release 2" /etc/system-release; then elif grep -qs "Amazon Linux release 2" /etc/system-release; then
os_type=amzn os_type=amzn

11
extras/vpnupgrade_centos.sh
View file

@ -28,14 +28,17 @@ vpnupgrade() {
os_type=centos os_type=centos
os_arch=$(uname -m | tr -dc 'A-Za-z0-9_-') os_arch=$(uname -m | tr -dc 'A-Za-z0-9_-')
if grep -qs "Red Hat" /etc/redhat-release; then rh_file="/etc/redhat-release"
if grep -qs "Red Hat" "$rh_file"; then
os_type=rhel os_type=rhel
fi fi
if grep -qs "release 7" "$rh_file"; then
if grep -qs "release 7" /etc/redhat-release; then
os_ver=7 os_ver=7
elif grep -qs "release 8" /etc/redhat-release; then elif grep -qs "release 8" "$rh_file"; then
os_ver=8 os_ver=8
if grep -qi stream "$rh_file"; then
os_ver=8s
fi
else else
echo "Error: This script only supports CentOS/RHEL 7 and 8." >&2 echo "Error: This script only supports CentOS/RHEL 7 and 8." >&2
echo "For Ubuntu/Debian, use https://git.io/vpnupgrade" >&2 echo "For Ubuntu/Debian, use https://git.io/vpnupgrade" >&2

11
vpnsetup_centos.sh
View file

@ -51,14 +51,17 @@ vpnsetup() {
os_type=centos os_type=centos
os_arch=$(uname -m | tr -dc 'A-Za-z0-9_-') os_arch=$(uname -m | tr -dc 'A-Za-z0-9_-')
if grep -qs "Red Hat" /etc/redhat-release; then rh_file="/etc/redhat-release"
if grep -qs "Red Hat" "$rh_file"; then
os_type=rhel os_type=rhel
fi fi
if grep -qs "release 7" "$rh_file"; then
if grep -qs "release 7" /etc/redhat-release; then
os_ver=7 os_ver=7
elif grep -qs "release 8" /etc/redhat-release; then elif grep -qs "release 8" "$rh_file"; then
os_ver=8 os_ver=8
if grep -qi stream "$rh_file"; then
os_ver=8s
fi
else else
echo "Error: This script only supports CentOS/RHEL 7 and 8." >&2 echo "Error: This script only supports CentOS/RHEL 7 and 8." >&2
echo "For Ubuntu/Debian, use https://git.io/vpnsetup" >&2 echo "For Ubuntu/Debian, use https://git.io/vpnsetup" >&2