From a3a77fef2427463821bea99184d727cbfa7e5a25 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Thu, 14 May 2020 14:06:26 +0500
Subject: [PATCH] bug fix incbackups for ubuntu

---
 IncBackups/IncBackupsControl.py | 3 ++-
 cyberpanel.sh                   | 2 +-
 plogical/processUtilities.py    | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IncBackups/IncBackupsControl.py b/IncBackups/IncBackupsControl.py
index b153a5b9e..618c950a4 100644
--- a/IncBackups/IncBackupsControl.py
+++ b/IncBackups/IncBackupsControl.py
@@ -122,7 +122,8 @@ class IncJobs(multi.Thread):
 
     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 = '/'
             return 1
         else:
diff --git a/cyberpanel.sh b/cyberpanel.sh
index 295d2c0c2..8038886a7 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -1175,7 +1175,7 @@ virtualenv -p /usr/bin/python3 /usr/local/CyberCP
 if [[ $UBUNTU_20 == "False" ]] ; then
    source /usr/local/CyberCP/bin/activate
    check_return
-   pip3.6 install --ignore-installed /usr/local/pip-packs/*
+   pip3 install --ignore-installed /usr/local/pip-packs/*
    check_return
 else
   . /usr/local/CyberCP/bin/activate
diff --git a/plogical/processUtilities.py b/plogical/processUtilities.py
index 336d8cb1b..fdd5e6990 100755
--- a/plogical/processUtilities.py
+++ b/plogical/processUtilities.py
@@ -16,6 +16,7 @@ class ProcessUtilities(multi.Thread):
     centos = 1
     cent8 = 2
     ubuntu = 0
+    ubuntu20 = 3
     server_address = '/usr/local/lscpd/admin/comm.sock'
     token = "unset"
 
@@ -139,6 +140,8 @@ class ProcessUtilities(multi.Thread):
         distroPath = '/etc/lsb-release'
 
         if os.path.exists(distroPath):
+            if open(distroPath, 'r').read().find('20.04') > -1:
+                return ProcessUtilities.ubuntu20
             return ProcessUtilities.ubuntu
         else:
             if open('/etc/redhat-release', 'r').read().find('CentOS Linux release 8') > -1: