From 4c5f4e8327c4fa80318b068c08611b5158c41c0c Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sun, 21 May 2023 22:19:30 -0500
Subject: [PATCH] Update OS check

- Update OS check to detect Amazon Linux 2023, which is not currently
  supported for use with this project.
  Ref: #1388
---
 extras/ikev2setup.sh      | 2 +-
 extras/quickstart.sh      | 2 +-
 extras/vpnuninstall.sh    | 2 +-
 extras/vpnupgrade.sh      | 2 +-
 extras/vpnupgrade_amzn.sh | 2 +-
 vpnsetup.sh               | 2 +-
 vpnsetup_amzn.sh          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extras/ikev2setup.sh b/extras/ikev2setup.sh
index f9668a1..454c4a3 100755
--- a/extras/ikev2setup.sh
+++ b/extras/ikev2setup.sh
@@ -66,7 +66,7 @@ check_os() {
     else
       exiterr "This script only supports CentOS/RHEL 7-9."
     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_ver=2
   else
diff --git a/extras/quickstart.sh b/extras/quickstart.sh
index ded5d0f..5f5b1b8 100755
--- a/extras/quickstart.sh
+++ b/extras/quickstart.sh
@@ -90,7 +90,7 @@ check_os() {
     else
       exiterr "This script only supports CentOS/RHEL 7-9."
     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_ver=2
   else
diff --git a/extras/vpnuninstall.sh b/extras/vpnuninstall.sh
index 1478c78..8a725de 100755
--- a/extras/vpnuninstall.sh
+++ b/extras/vpnuninstall.sh
@@ -46,7 +46,7 @@ check_os() {
     if ! grep -q -E "release (7|8|9)" "$rh_file"; then
       exiterr "This script only supports CentOS/RHEL 7-9."
     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
   else
     os_type=$(lsb_release -si 2>/dev/null)
diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh
index 0d986a1..56e3463 100755
--- a/extras/vpnupgrade.sh
+++ b/extras/vpnupgrade.sh
@@ -60,7 +60,7 @@ check_os() {
     else
       exiterr "This script only supports CentOS/RHEL 7-9."
     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_ver=2
   else
diff --git a/extras/vpnupgrade_amzn.sh b/extras/vpnupgrade_amzn.sh
index 939b0e6..e152c09 100755
--- a/extras/vpnupgrade_amzn.sh
+++ b/extras/vpnupgrade_amzn.sh
@@ -34,7 +34,7 @@ check_root() {
 }
 
 check_os() {
-  if ! grep -qs "Amazon Linux release 2" /etc/system-release; then
+  if ! grep -qs "Amazon Linux release 2 " /etc/system-release; then
     exiterr "This script only supports Amazon Linux 2."
   fi
 }
diff --git a/vpnsetup.sh b/vpnsetup.sh
index ded5d0f..5f5b1b8 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -90,7 +90,7 @@ check_os() {
     else
       exiterr "This script only supports CentOS/RHEL 7-9."
     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_ver=2
   else
diff --git a/vpnsetup_amzn.sh b/vpnsetup_amzn.sh
index 9087a65..5e602da 100755
--- a/vpnsetup_amzn.sh
+++ b/vpnsetup_amzn.sh
@@ -53,7 +53,7 @@ check_root() {
 }
 
 check_os() {
-  if ! grep -qs "Amazon Linux release 2" /etc/system-release; then
+  if ! grep -qs "Amazon Linux release 2 " /etc/system-release; then
     exiterr "This script only supports Amazon Linux 2."
   fi
 }