From d90c6121b69a1b8523207f31e5fd9fcb645df70c Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Tue, 20 Apr 2021 00:09:00 -0500
Subject: [PATCH] Improve OS detection

---
 extras/ikev2setup.sh        | 12 ++++++++----
 extras/vpnupgrade_centos.sh | 11 +++++++----
 vpnsetup_centos.sh          | 11 +++++++----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/extras/ikev2setup.sh b/extras/ikev2setup.sh
index 29d4dd0..6692fd2 100755
--- a/extras/ikev2setup.sh
+++ b/extras/ikev2setup.sh
@@ -37,15 +37,19 @@ check_run_as_root() {
 
 check_os_type() {
   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
-    if grep -qs "Red Hat" /etc/redhat-release; then
+    if grep -qs "Red Hat" "$rh_file"; then
       os_type=rhel
     fi
-    if grep -qs "release 7" /etc/redhat-release; then
+    if grep -qs "release 7" "$rh_file"; then
       os_ver=7
-    elif grep -qs "release 8" /etc/redhat-release; then
+    elif grep -qs "release 8" "$rh_file"; then
       os_ver=8
+      if grep -qi stream "$rh_file"; then
+        os_ver=8s
+      fi
     fi
   elif grep -qs "Amazon Linux release 2" /etc/system-release; then
     os_type=amzn
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index 6c284d8..25e0657 100755
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -28,14 +28,17 @@ vpnupgrade() {
 
 os_type=centos
 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
 fi
-
-if grep -qs "release 7" /etc/redhat-release; then
+if grep -qs "release 7" "$rh_file"; then
   os_ver=7
-elif grep -qs "release 8" /etc/redhat-release; then
+elif grep -qs "release 8" "$rh_file"; then
   os_ver=8
+  if grep -qi stream "$rh_file"; then
+    os_ver=8s
+  fi
 else
   echo "Error: This script only supports CentOS/RHEL 7 and 8." >&2
   echo "For Ubuntu/Debian, use https://git.io/vpnupgrade" >&2
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 13ce65a..2d22595 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -51,14 +51,17 @@ vpnsetup() {
 
 os_type=centos
 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
 fi
-
-if grep -qs "release 7" /etc/redhat-release; then
+if grep -qs "release 7" "$rh_file"; then
   os_ver=7
-elif grep -qs "release 8" /etc/redhat-release; then
+elif grep -qs "release 8" "$rh_file"; then
   os_ver=8
+  if grep -qi stream "$rh_file"; then
+    os_ver=8s
+  fi
 else
   echo "Error: This script only supports CentOS/RHEL 7 and 8." >&2
   echo "For Ubuntu/Debian, use https://git.io/vpnsetup" >&2