From 4b63373ccc2cea134f5efc0914ca23bcf410d96d Mon Sep 17 00:00:00 2001 From: Michael Rook Date: Mon, 6 Jun 2022 21:29:39 +1000 Subject: [PATCH 1/3] Add almalinux 9 to the checks --- README.md | 1 + xo-install.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 41aca9e..337a7af 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ First thing you need is a VM (or even a physical machine if you wish) where to i Supported Linux distributions and versions: - CentOS 8 Stream +- AlmaLinux 9 - AlmaLinux 8 - Rocky Linux 8 - Debian 11 diff --git a/xo-install.sh b/xo-install.sh index 64111f5..1b90620 100755 --- a/xo-install.sh +++ b/xo-install.sh @@ -1266,8 +1266,8 @@ function CheckOS { fi # for future if/when something above 8 is released - if [[ "$OSNAME" == "AlmaLinux" ]] && [[ "$OSVERSION" != "8" ]]; then - printfail "Only AlmaLinux 8 supported" + if [[ "$OSNAME" == "AlmaLinux" ]] && [[ "$OSVERSION" =~ ^(8|9)$ ]]; then + printfail "Only AlmaLinux 8/9 supported" exit 1 fi From 45ffb105f353cf42e1e73bed942bc9315b12a7aa Mon Sep 17 00:00:00 2001 From: Michael Rook Date: Mon, 6 Jun 2022 21:31:15 +1000 Subject: [PATCH 2/3] Remove comment about something above almalinux 8 --- xo-install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/xo-install.sh b/xo-install.sh index 1b90620..f0f8e90 100755 --- a/xo-install.sh +++ b/xo-install.sh @@ -1265,7 +1265,6 @@ function CheckOS { exit 1 fi - # for future if/when something above 8 is released if [[ "$OSNAME" == "AlmaLinux" ]] && [[ "$OSVERSION" =~ ^(8|9)$ ]]; then printfail "Only AlmaLinux 8/9 supported" exit 1 From 2aa976773c5a0200b33748205180a2cb821da62d Mon Sep 17 00:00:00 2001 From: Michael Rook Date: Tue, 7 Jun 2022 17:12:59 +1000 Subject: [PATCH 3/3] Fix issue with Almalinux check failing after inclusion of version 9 --- xo-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xo-install.sh b/xo-install.sh index f0f8e90..a70ca4e 100755 --- a/xo-install.sh +++ b/xo-install.sh @@ -1265,7 +1265,7 @@ function CheckOS { exit 1 fi - if [[ "$OSNAME" == "AlmaLinux" ]] && [[ "$OSVERSION" =~ ^(8|9)$ ]]; then + if [[ "$OSNAME" == "AlmaLinux" ]] && [[ ! "$OSVERSION" =~ ^(8|9)$ ]]; then printfail "Only AlmaLinux 8/9 supported" exit 1 fi