mirror of
https://github.com/usmannasir/cyberpanel.git
synced 2025-11-08 22:36:12 +01:00
bug fix: decidedistro check
This commit is contained in:
@@ -169,27 +169,31 @@ class ProcessUtilities(multi.Thread):
|
||||
distroPath = '/etc/lsb-release'
|
||||
distroPathAlma = '/etc/redhat-release'
|
||||
|
||||
if os.path.exists(distroPath):
|
||||
|
||||
## this is check only
|
||||
if open(distroPath, 'r').read().find('22.04') > -1:
|
||||
ProcessUtilities.ubuntu22Check = 1
|
||||
# First check if we're on Ubuntu
|
||||
if os.path.exists('/etc/os-release'):
|
||||
with open('/etc/os-release', 'r') as f:
|
||||
content = f.read()
|
||||
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'):
|
||||
return ProcessUtilities.ubuntu20
|
||||
return ProcessUtilities.ubuntu
|
||||
else:
|
||||
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 \
|
||||
or open('/etc/redhat-release', 'r').read().find('Rocky Linux release 8') > -1 \
|
||||
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 \
|
||||
open('/etc/redhat-release', 'r').read().find('CloudLinux release 9') > -1 or open('/etc/redhat-release', 'r').read().find('CloudLinux release 8') > -1:
|
||||
## this is check only
|
||||
if open(distroPathAlma, 'r').read().find('AlmaLinux release 9') > -1 or open(distroPathAlma, 'r').read().find('Rocky Linux release 9') > -1:
|
||||
ProcessUtilities.alma9check = 1
|
||||
|
||||
return ProcessUtilities.cent8
|
||||
return ProcessUtilities.centos
|
||||
# Check for RedHat-based distributions
|
||||
if os.path.exists(distroPathAlma):
|
||||
with open(distroPathAlma, 'r') as f:
|
||||
content = f.read()
|
||||
if any(x in content for x in ['CentOS Linux release 8', 'AlmaLinux release 8', 'Rocky Linux release 8',
|
||||
'Rocky Linux release 9', 'AlmaLinux release 9', 'CloudLinux release 9',
|
||||
'CloudLinux release 8']):
|
||||
if any(x in content for x in ['AlmaLinux release 9', 'Rocky Linux release 9']):
|
||||
ProcessUtilities.alma9check = 1
|
||||
return ProcessUtilities.cent8
|
||||
|
||||
# Default to Ubuntu if no other distribution is detected
|
||||
return ProcessUtilities.ubuntu
|
||||
|
||||
@staticmethod
|
||||
def containerCheck():
|
||||
|
||||
Reference in New Issue
Block a user