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

bug fix incbackups for ubuntu

Browse Source
This commit is contained in:
Usman Nasir
2020-05-14 14:06:26 +05:00
parent ef91568933
commit a3a77fef24
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
IncBackups/IncBackupsControl.py
View File

@@ -122,7 +122,8 @@ class IncJobs(multi.Thread):
def findRestorePath(self): def findRestorePath(self):
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8 \
or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
self.restoreTarget = '/' self.restoreTarget = '/'
return 1 return 1
else: else:

2
cyberpanel.sh
View File

@@ -1175,7 +1175,7 @@ virtualenv -p /usr/bin/python3 /usr/local/CyberCP
if [[ $UBUNTU_20 == "False" ]] ; then if [[ $UBUNTU_20 == "False" ]] ; then
source /usr/local/CyberCP/bin/activate source /usr/local/CyberCP/bin/activate
check_return check_return
pip3.6 install --ignore-installed /usr/local/pip-packs/* pip3 install --ignore-installed /usr/local/pip-packs/*
check_return check_return
else else
. /usr/local/CyberCP/bin/activate . /usr/local/CyberCP/bin/activate

3
plogical/processUtilities.py
View File

@@ -16,6 +16,7 @@ class ProcessUtilities(multi.Thread):
centos = 1 centos = 1
cent8 = 2 cent8 = 2
ubuntu = 0 ubuntu = 0
ubuntu20 = 3
server_address = '/usr/local/lscpd/admin/comm.sock' server_address = '/usr/local/lscpd/admin/comm.sock'
token = "unset" token = "unset"
@@ -139,6 +140,8 @@ class ProcessUtilities(multi.Thread):
distroPath = '/etc/lsb-release' distroPath = '/etc/lsb-release'
if os.path.exists(distroPath): if os.path.exists(distroPath):
if open(distroPath, 'r').read().find('20.04') > -1:
return ProcessUtilities.ubuntu20
return ProcessUtilities.ubuntu return ProcessUtilities.ubuntu
else: else:
if open('/etc/redhat-release', 'r').read().find('CentOS Linux release 8') > -1: if open('/etc/redhat-release', 'r').read().find('CentOS Linux release 8') > -1: