From 291518f73c3169abd99d9e1e7f800ca035a4e265 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Sat, 11 Apr 2020 20:55:39 +0500
Subject: [PATCH] bug fix: upgrade

---
 cyberpanel_upgrade.sh | 24 +++++++++++++++++-------
 test.sh               |  6 ------
 2 files changed, 17 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 test.sh

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index 6c739dfe3..ecc08bed0 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -214,10 +214,15 @@ else
 fi
 
 
-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
+if [[ -f /usr/local/CyberPanel/bin/python2 ]] ; then
+  rm -rf /usr/local/CyberPanel/bin
+  virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel
+  check_return
+elif [[ -f /usr/local/CyberPanel/bin/ ]] ; then
+  echo -e "\nNo need to resetup virtualenv at /usr/local/CyberPanel...\n"
+else
+   virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel
+  check_return
 fi
 
 rm -f requirments.txt
@@ -262,9 +267,14 @@ fi
 /usr/local/CyberPanel/bin/python upgrade.py $BRANCH_NAME
 check_return
 
-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
+if [[ -f /usr/local/CyberCP/bin/python2 ]] ; then
+ rm -rf /usr/local/CyberCP/bin
+ virtualenv -p /usr/bin/python3 /usr/local/CyberCP
+elif [[ -f /usr/local/CyberCP/bin/ ]] ; then
+  echo -e "\nNo need to resetup virtualenv at /usr/local/CyberCP...\n"
+else
+  virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberCP
+  check_return
 fi
 
 check_return
diff --git a/test.sh b/test.sh
old mode 100644
new mode 100755
index d9bdb6f94..e69de29bb
--- a/test.sh
+++ b/test.sh
@@ -1,6 +0,0 @@
-test4
-<<<<<<< HEAD
-
-=======
-test3
->>>>>>> stable