Improve OS detection

- Improve OS detection and clean up

extras/ikev2changeaddr.sh

@@ -36,44 +36,16 @@ check_root() {
 }
 
 check_os() {
-  os_type=centos
+  os_type=$(lsb_release -si 2>/dev/null)
-  rh_file="/etc/redhat-release"
+  [ -z "$os_type" ] && [ -f /etc/os-release ] && os_type=$(. /etc/os-release && printf '%s' "$ID")
-  if grep -qs "Red Hat" "$rh_file"; then
+  case $os_type in
-    os_type=rhel
+    [Aa]lpine)
-  fi
+      os_type=alpine
-  [ -f /etc/oracle-release ] && os_type=ol
+      ;;
-  if grep -qs "release 7" "$rh_file" || grep -qs "release 8" "$rh_file" \
+    *)
-    || grep -qs "release 9" "$rh_file"; then
+      os_type=other
-    grep -qs -i rocky "$rh_file" && os_type=rocky
+      ;;
-    grep -qs -i alma "$rh_file" && os_type=alma
+  esac
-  elif grep -qs "Amazon Linux release 2" /etc/system-release; then
-    os_type=amzn
-  else
-    os_type=$(lsb_release -si 2>/dev/null)
-    [ -z "$os_type" ] && [ -f /etc/os-release ] && os_type=$(. /etc/os-release && printf '%s' "$ID")
-    case $os_type in
-      [Uu]buntu)
-        os_type=ubuntu
-        ;;
-      [Dd]ebian)
-        os_type=debian
-        ;;
-      [Rr]aspbian)
-        os_type=raspbian
-        ;;
-      [Aa]lpine)
-        os_type=alpine
-        ;;
-      *)
-cat 1>&2 <<'EOF'
-Error: This script only supports one of the following OS:
-       Ubuntu, Debian, CentOS/RHEL, Rocky Linux, AlmaLinux,
-       Oracle Linux, Amazon Linux 2 or Alpine Linux
-EOF
-        exit 1
-        ;;
-    esac
-  fi
 }
 
 check_libreswan() {

extras/ikev2setup.sh

@@ -46,23 +46,26 @@ check_container() {
 }
 
 check_os() {
-  os_type=centos
-  os_arch=$(uname -m | tr -dc 'A-Za-z0-9_-')
   rh_file="/etc/redhat-release"
-  if grep -qs "Red Hat" "$rh_file"; then
+  if [ -f "$rh_file" ]; then
-    os_type=rhel
+    os_type=centos
-  fi
+    if grep -q "Red Hat" "$rh_file"; then
-  [ -f /etc/oracle-release ] && os_type=ol
+      os_type=rhel
-  grep -qs -i rocky "$rh_file" && os_type=rocky
+    fi
-  grep -qs -i alma "$rh_file" && os_type=alma
+    [ -f /etc/oracle-release ] && os_type=ol
-  if grep -qs "release 7" "$rh_file"; then
+    grep -qi rocky "$rh_file" && os_type=rocky
-    os_ver=7
+    grep -qi alma "$rh_file" && os_type=alma
-  elif grep -qs "release 8" "$rh_file"; then
+    if grep -q "release 7" "$rh_file"; then
-    os_ver=8
+      os_ver=7
-    grep -qi stream "$rh_file" && os_ver=8s
+    elif grep -q "release 8" "$rh_file"; then
-  elif grep -qs "release 9" "$rh_file"; then
+      os_ver=8
-    os_ver=9
+      grep -qi stream "$rh_file" && os_ver=8s
-    grep -qi stream "$rh_file" && os_ver=9s
+    elif grep -q "release 9" "$rh_file"; then
+      os_ver=9
+      grep -qi stream "$rh_file" && os_ver=9s
+    else
+      exiterr "This script only supports CentOS/RHEL 7-9."
+    fi
   elif grep -qs "Amazon Linux release 2" /etc/system-release; then
     os_type=amzn
     os_ver=2
@@ -154,7 +157,7 @@ confirm_or_abort() {
 show_header() {
 cat <<'EOF'
 
-IKEv2 Script   Copyright (c) 2020-2022 Lin Song   9 Aug 2022
+IKEv2 Script   Copyright (c) 2020-2022 Lin Song   10 Aug 2022
 
 EOF
 }
@@ -1151,6 +1154,7 @@ EOF
 }
 
 apply_ubuntu1804_nss_fix() {
+  os_arch=$(uname -m | tr -dc 'A-Za-z0-9_-')
   if [ "$os_type" = "ubuntu" ] && [ "$os_ver" = "bustersid" ] && [ "$os_arch" = "x86_64" ]; then
     nss_url1="https://mirrors.kernel.org/ubuntu/pool/main/n/nss"
     nss_url2="https://mirrors.kernel.org/ubuntu/pool/universe/n/nss"

extras/quickstart.sh

@@ -69,25 +69,29 @@ EOF
 }
 
 check_os() {
-  os_type=centos
   rh_file="/etc/redhat-release"
-  if grep -qs "Red Hat" "$rh_file"; then
+  if [ -f "$rh_file" ]; then
-    os_type=rhel
+    os_type=centos
-  fi
+    if grep -q "Red Hat" "$rh_file"; then
-  [ -f /etc/oracle-release ] && os_type=ol
+      os_type=rhel
-  grep -qs -i rocky "$rh_file" && os_type=rocky
+    fi
-  grep -qs -i alma "$rh_file" && os_type=alma
+    [ -f /etc/oracle-release ] && os_type=ol
-  if grep -qs "release 7" "$rh_file"; then
+    grep -qi rocky "$rh_file" && os_type=rocky
-    os_ver=7
+    grep -qi alma "$rh_file" && os_type=alma
-  elif grep -qs "release 8" "$rh_file"; then
+    if grep -q "release 7" "$rh_file"; then
-    os_ver=8
+      os_ver=7
-    grep -qi stream "$rh_file" && os_ver=8s
+    elif grep -q "release 8" "$rh_file"; then
-    if [ "$os_type" = "centos" ] && [ "$os_ver" = "8" ]; then
+      os_ver=8
-      exiterr "CentOS Linux 8 is EOL and not supported."
+      grep -qi stream "$rh_file" && os_ver=8s
+      if [ "$os_type$os_ver" = "centos8" ]; then
+        exiterr "CentOS Linux 8 is EOL and not supported."
+      fi
+    elif grep -q "release 9" "$rh_file"; then
+      os_ver=9
+      grep -qi stream "$rh_file" && os_ver=9s
+    else
+      exiterr "This script only supports CentOS/RHEL 7-9."
     fi
-  elif grep -qs "release 9" "$rh_file"; then
-    os_ver=9
-    grep -qi stream "$rh_file" && os_ver=9s
   elif grep -qs "Amazon Linux release 2" /etc/system-release; then
     os_type=amzn
     os_ver=2

extras/vpnuninstall.sh

@@ -34,16 +34,18 @@ check_root() {
 }
 
 check_os() {
-  os_type=centos
   rh_file="/etc/redhat-release"
-  if grep -qs "Red Hat" "$rh_file"; then
+  if [ -f "$rh_file" ]; then
-    os_type=rhel
+    os_type=centos
-  fi
+    if grep -q "Red Hat" "$rh_file"; then
-  [ -f /etc/oracle-release ] && os_type=ol
+      os_type=rhel
-  if grep -qs "release 7" "$rh_file" || grep -qs "release 8" "$rh_file" \
+    fi
-    || grep -qs "release 9" "$rh_file"; then
+    [ -f /etc/oracle-release ] && os_type=ol
-    grep -qs -i rocky "$rh_file" && os_type=rocky
+    grep -qi rocky "$rh_file" && os_type=rocky
-    grep -qs -i alma "$rh_file" && os_type=alma
+    grep -qi alma "$rh_file" && os_type=alma
+    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
     os_type=amzn
   else

extras/vpnupgrade.sh

@@ -37,25 +37,29 @@ check_vz() {
 }
 
 check_os() {
-  os_type=centos
   rh_file="/etc/redhat-release"
-  if grep -qs "Red Hat" "$rh_file"; then
+  if [ -f "$rh_file" ]; then
-    os_type=rhel
+    os_type=centos
-  fi
+    if grep -q "Red Hat" "$rh_file"; then
-  [ -f /etc/oracle-release ] && os_type=ol
+      os_type=rhel
-  grep -qs -i rocky "$rh_file" && os_type=rocky
+    fi
-  grep -qs -i alma "$rh_file" && os_type=alma
+    [ -f /etc/oracle-release ] && os_type=ol
-  if grep -qs "release 7" "$rh_file"; then
+    grep -qi rocky "$rh_file" && os_type=rocky
-    os_ver=7
+    grep -qi alma "$rh_file" && os_type=alma
-  elif grep -qs "release 8" "$rh_file"; then
+    if grep -q "release 7" "$rh_file"; then
-    os_ver=8
+      os_ver=7
-    grep -qi stream "$rh_file" && os_ver=8s
+    elif grep -q "release 8" "$rh_file"; then
-    if [ "$os_type" = "centos" ] && [ "$os_ver" = "8" ]; then
+      os_ver=8
-      exiterr "CentOS Linux 8 is EOL and not supported."
+      grep -qi stream "$rh_file" && os_ver=8s
+      if [ "$os_type$os_ver" = "centos8" ]; then
+        exiterr "CentOS Linux 8 is EOL and not supported."
+      fi
+    elif grep -q "release 9" "$rh_file"; then
+      os_ver=9
+      grep -qi stream "$rh_file" && os_ver=9s
+    else
+      exiterr "This script only supports CentOS/RHEL 7-9."
     fi
-  elif grep -qs "release 9" "$rh_file"; then
-    os_ver=9
-    grep -qi stream "$rh_file" && os_ver=9s
   elif grep -qs "Amazon Linux release 2" /etc/system-release; then
     os_type=amzn
     os_ver=2

extras/vpnupgrade_centos.sh

@@ -40,25 +40,29 @@ check_vz() {
 }
 
 check_os() {
-  os_type=centos
   rh_file="/etc/redhat-release"
-  if grep -qs "Red Hat" "$rh_file"; then
+  if [ -f "$rh_file" ]; then
-    os_type=rhel
+    os_type=centos
-  fi
+    if grep -q "Red Hat" "$rh_file"; then
-  [ -f /etc/oracle-release ] && os_type=ol
+      os_type=rhel
-  grep -qs -i rocky "$rh_file" && os_type=rocky
+    fi
-  grep -qs -i alma "$rh_file" && os_type=alma
+    [ -f /etc/oracle-release ] && os_type=ol
-  if grep -qs "release 7" "$rh_file"; then
+    grep -qi rocky "$rh_file" && os_type=rocky
-    os_ver=7
+    grep -qi alma "$rh_file" && os_type=alma
-  elif grep -qs "release 8" "$rh_file"; then
+    if grep -q "release 7" "$rh_file"; then
-    os_ver=8
+      os_ver=7
-    grep -qi stream "$rh_file" && os_ver=8s
+    elif grep -q "release 8" "$rh_file"; then
-    if [ "$os_type" = "centos" ] && [ "$os_ver" = "8" ]; then
+      os_ver=8
-      exiterr "CentOS Linux 8 is EOL and not supported."
+      grep -qi stream "$rh_file" && os_ver=8s
+      if [ "$os_type$os_ver" = "centos8" ]; then
+        exiterr "CentOS Linux 8 is EOL and not supported."
+      fi
+    elif grep -q "release 9" "$rh_file"; then
+      os_ver=9
+      grep -qi stream "$rh_file" && os_ver=9s
+    else
+      exiterr "This script only supports CentOS/RHEL 7-9."
     fi
-  elif grep -qs "release 9" "$rh_file"; then
-    os_ver=9
-    grep -qi stream "$rh_file" && os_ver=9s
   else
 cat 1>&2 <<'EOF'
 Error: This script only supports one of the following OS:
@@ -166,7 +170,7 @@ install_pkgs_2() {
   erp="--enablerepo"
   rp1="$erp=*server-*optional*"
   rp2="$erp=*releases-optional*"
-  if [ "$os_type" = "ol" ] && [ "$os_ver" = "7" ]; then
+  if [ "$os_type$os_ver" = "ol7" ]; then
     rp2="$erp=ol7_optional_latest"
   fi
   if [ "$os_ver" = "7" ]; then

vpnsetup.sh

@@ -69,25 +69,29 @@ EOF
 }
 
 check_os() {
-  os_type=centos
   rh_file="/etc/redhat-release"
-  if grep -qs "Red Hat" "$rh_file"; then
+  if [ -f "$rh_file" ]; then
-    os_type=rhel
+    os_type=centos
-  fi
+    if grep -q "Red Hat" "$rh_file"; then
-  [ -f /etc/oracle-release ] && os_type=ol
+      os_type=rhel
-  grep -qs -i rocky "$rh_file" && os_type=rocky
+    fi
-  grep -qs -i alma "$rh_file" && os_type=alma
+    [ -f /etc/oracle-release ] && os_type=ol
-  if grep -qs "release 7" "$rh_file"; then
+    grep -qi rocky "$rh_file" && os_type=rocky
-    os_ver=7
+    grep -qi alma "$rh_file" && os_type=alma
-  elif grep -qs "release 8" "$rh_file"; then
+    if grep -q "release 7" "$rh_file"; then
-    os_ver=8
+      os_ver=7
-    grep -qi stream "$rh_file" && os_ver=8s
+    elif grep -q "release 8" "$rh_file"; then
-    if [ "$os_type" = "centos" ] && [ "$os_ver" = "8" ]; then
+      os_ver=8
-      exiterr "CentOS Linux 8 is EOL and not supported."
+      grep -qi stream "$rh_file" && os_ver=8s
+      if [ "$os_type$os_ver" = "centos8" ]; then
+        exiterr "CentOS Linux 8 is EOL and not supported."
+      fi
+    elif grep -q "release 9" "$rh_file"; then
+      os_ver=9
+      grep -qi stream "$rh_file" && os_ver=9s
+    else
+      exiterr "This script only supports CentOS/RHEL 7-9."
     fi
-  elif grep -qs "release 9" "$rh_file"; then
-    os_ver=9
-    grep -qi stream "$rh_file" && os_ver=9s
   elif grep -qs "Amazon Linux release 2" /etc/system-release; then
     os_type=amzn
     os_ver=2

vpnsetup_centos.sh

@@ -74,25 +74,29 @@ EOF
 }
 
 check_os() {
-  os_type=centos
   rh_file="/etc/redhat-release"
-  if grep -qs "Red Hat" "$rh_file"; then
+  if [ -f "$rh_file" ]; then
-    os_type=rhel
+    os_type=centos
-  fi
+    if grep -q "Red Hat" "$rh_file"; then
-  [ -f /etc/oracle-release ] && os_type=ol
+      os_type=rhel
-  grep -qs -i rocky "$rh_file" && os_type=rocky
+    fi
-  grep -qs -i alma "$rh_file" && os_type=alma
+    [ -f /etc/oracle-release ] && os_type=ol
-  if grep -qs "release 7" "$rh_file"; then
+    grep -qi rocky "$rh_file" && os_type=rocky
-    os_ver=7
+    grep -qi alma "$rh_file" && os_type=alma
-  elif grep -qs "release 8" "$rh_file"; then
+    if grep -q "release 7" "$rh_file"; then
-    os_ver=8
+      os_ver=7
-    grep -qi stream "$rh_file" && os_ver=8s
+    elif grep -q "release 8" "$rh_file"; then
-    if [ "$os_type" = "centos" ] && [ "$os_ver" = "8" ]; then
+      os_ver=8
-      exiterr "CentOS Linux 8 is EOL and not supported."
+      grep -qi stream "$rh_file" && os_ver=8s
+      if [ "$os_type$os_ver" = "centos8" ]; then
+        exiterr "CentOS Linux 8 is EOL and not supported."
+      fi
+    elif grep -q "release 9" "$rh_file"; then
+      os_ver=9
+      grep -qi stream "$rh_file" && os_ver=9s
+    else
+      exiterr "This script only supports CentOS/RHEL 7-9."
     fi
-  elif grep -qs "release 9" "$rh_file"; then
-    os_ver=9
-    grep -qi stream "$rh_file" && os_ver=9s
   else
 cat 1>&2 <<'EOF'
 Error: This script only supports one of the following OS: