From 435b4ded92d0e014b1664743738e5083027da2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C3=B8=20Lonyai?= Date: Fri, 10 Jan 2025 15:31:36 +0100 Subject: [PATCH 1/2] Fix some trivial issue with the installation to CentOS Stream 9 --- install.sh | 3 +++ install/installCyberPanel.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/install.sh b/install.sh index 187bcb6c0..bada6fe1c 100644 --- a/install.sh +++ b/install.sh @@ -9,6 +9,9 @@ yum update curl wget ca-certificates -y 1> /dev/null elif echo $OUTPUT | grep -q "CentOS Linux 8" ; then echo -e "\nDetecting Centos 8...\n" SERVER_OS="CentOS8" +elif echo $OUTPUT | grep -q "CentOS Linux 9" ; then + echo -e "\nDetecting Centos 9...\n" + SERVER_OS="CentOS8" yum install curl wget -y 1> /dev/null yum update curl wget ca-certificates -y 1> /dev/null elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index c9cd42af7..a1f53efe4 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -52,6 +52,8 @@ def FetchCloudLinuxAlmaVersionVersion(): return 'al-87' elif (data.find('AlmaLinux') > -1 or data.find('almalinux') > -1) and (data.find('9.4') > -1 or data.find('9.3') > -1 or data.find('Shamrock Pampas') > -1 or data.find('Seafoam Ocelot') > -1 or data.find('VERSION="9.') > -1): return 'al-93' + elif data.find('CentOS Stream 9') > -1: + return 'el-9' else: return -1 From 16d82ee7329efceb57a28e2027927407a6b432b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C3=B8=20Lonyai?= Date: Fri, 10 Jan 2025 15:31:36 +0100 Subject: [PATCH 2/2] Fix some trivial issue with the installation to CentOS Stream 9 --- install.sh | 3 +++ install/installCyberPanel.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/install.sh b/install.sh index 187bcb6c0..c6328a8d0 100644 --- a/install.sh +++ b/install.sh @@ -9,6 +9,9 @@ yum update curl wget ca-certificates -y 1> /dev/null elif echo $OUTPUT | grep -q "CentOS Linux 8" ; then echo -e "\nDetecting Centos 8...\n" SERVER_OS="CentOS8" +elif echo $OUTPUT | grep -q "CentOS Stream 9" ; then + echo -e "\nDetecting Centos Stream 9...\n" + SERVER_OS="CentOS8" yum install curl wget -y 1> /dev/null yum update curl wget ca-certificates -y 1> /dev/null elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index c9cd42af7..a1f53efe4 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -52,6 +52,8 @@ def FetchCloudLinuxAlmaVersionVersion(): return 'al-87' elif (data.find('AlmaLinux') > -1 or data.find('almalinux') > -1) and (data.find('9.4') > -1 or data.find('9.3') > -1 or data.find('Shamrock Pampas') > -1 or data.find('Seafoam Ocelot') > -1 or data.find('VERSION="9.') > -1): return 'al-93' + elif data.find('CentOS Stream 9') > -1: + return 'el-9' else: return -1