From 2efa3c214213031b52ccd59920a1be4537b3116f Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Sat, 11 Apr 2020 18:53:11 +0500
Subject: [PATCH] further improvements to upgrade

---
 cyberpanel_upgrade.sh |  4 ++--
 plogical/upgrade.py   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index ae417f829..6c739dfe3 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -214,7 +214,7 @@ else
 fi
 
 
-if [[ -f /usr/local/CyberPanel/bin/python2 ]] ; then
+if [[ -f /usr/local/CyberPanel/bin/python2 ]] || [[ ! -f /usr/local/CyberPanel/bin ]] ; then
  rm -rf /usr/local/CyberPanel/bin
  virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel
  check_return
@@ -262,7 +262,7 @@ fi
 /usr/local/CyberPanel/bin/python upgrade.py $BRANCH_NAME
 check_return
 
-if [[ -f /usr/local/CyberCP/bin/python2 ]] ; then
+if [[ -f /usr/local/CyberCP/bin/python2 ]] || [[ ! -f /usr/local/CyberCP/bin ]] ; then
 rm -rf /usr/local/CyberCP/bin
 virtualenv -p /usr/bin/python3 /usr/local/CyberCP
 fi
diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index e668d8b27..a0d9cd074 100755
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -1291,6 +1291,18 @@ class Upgrade:
                 command = 'git pull'
                 Upgrade.executioner(command, command, 1)
 
+            elif currentBranch.find('not a git repository') > -1:
+
+                os.chdir('/usr/local')
+
+                command = 'git clone https://github.com/usmannasir/cyberpanel'
+                Upgrade.executioner(command, 'Download CyberPanel', 1)
+
+                if os.path.exists('CyberCP'):
+                    shutil.rmtree('CyberCP')
+
+                shutil.move('cyberpanel', 'CyberCP')
+
             else:
                 command = 'git stash'
                 Upgrade.executioner(command, command, 1)