Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-09 06:46:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: decidedistro check

Browse Source
This commit is contained in:
usmannasir
2025-04-24 14:08:07 +05:00
parent df545cfef2
commit a2e4e4eca5
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
plogical/processUtilities.py
View File

@@ -169,27 +169,31 @@ class ProcessUtilities(multi.Thread):
distroPath = '/etc/lsb-release' distroPath = '/etc/lsb-release'
distroPathAlma = '/etc/redhat-release' distroPathAlma = '/etc/redhat-release'
if os.path.exists(distroPath): # First check if we're on Ubuntu
if os.path.exists('/etc/os-release'):
## this is check only with open('/etc/os-release', 'r') as f:
if open(distroPath, 'r').read().find('22.04') > -1: content = f.read()
ProcessUtilities.ubuntu22Check = 1 if 'Ubuntu' in content:
if '22.04' in content:
ProcessUtilities.ubuntu22Check = 1
return ProcessUtilities.ubuntu20
elif '20.04' in content:
return ProcessUtilities.ubuntu20
return ProcessUtilities.ubuntu
if open(distroPath, 'r').read().find('20.04') > -1 or open(distroPath, 'r').read().find('22.04'): # Check for RedHat-based distributions
return ProcessUtilities.ubuntu20 if os.path.exists(distroPathAlma):
return ProcessUtilities.ubuntu with open(distroPathAlma, 'r') as f:
else: content = f.read()
if open('/etc/redhat-release', 'r').read().find('CentOS Linux release 8') > -1 or open('/etc/redhat-release', 'r').read().find('AlmaLinux release 8') > -1 \ if any(x in content for x in ['CentOS Linux release 8', 'AlmaLinux release 8', 'Rocky Linux release 8',
or open('/etc/redhat-release', 'r').read().find('Rocky Linux release 8') > -1 \ 'Rocky Linux release 9', 'AlmaLinux release 9', 'CloudLinux release 9',
or open('/etc/redhat-release', 'r').read().find('Rocky Linux release 9') > -1 or open('/etc/redhat-release', 'r').read().find('AlmaLinux release 9') > -1 or \ 'CloudLinux release 8']):
open('/etc/redhat-release', 'r').read().find('CloudLinux release 9') > -1 or open('/etc/redhat-release', 'r').read().find('CloudLinux release 8') > -1: if any(x in content for x in ['AlmaLinux release 9', 'Rocky Linux release 9']):
## this is check only ProcessUtilities.alma9check = 1
if open(distroPathAlma, 'r').read().find('AlmaLinux release 9') > -1 or open(distroPathAlma, 'r').read().find('Rocky Linux release 9') > -1: return ProcessUtilities.cent8
ProcessUtilities.alma9check = 1
return ProcessUtilities.cent8
return ProcessUtilities.centos
# Default to Ubuntu if no other distribution is detected
return ProcessUtilities.ubuntu
@staticmethod @staticmethod
def containerCheck(): def containerCheck():