From e973cc26d1669476d37412e63ac2fad68da0e9be Mon Sep 17 00:00:00 2001
From: qtwrk <qtwrk555@gmail.com>
Date: Mon, 9 Mar 2020 03:18:31 +0100
Subject: [PATCH 1/2] fix MarkupSafe module issue

---
 cyberpanel.sh | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 6c8d0a5e3..cc886b1c3 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -1173,29 +1173,6 @@ export LC_CTYPE=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 #need to set lang to address some pip module installation issue.
 
-if [[ $DEV == "OFF" ]] ; then
-
-if [[ $PROVIDER == "Alibaba Cloud" ]] ; then
-	pip install --upgrade pip
-	pip install setuptools==40.8.0
-fi
-
-if [[ $SERVER_OS == "CentOS" ]] ; then
-    pip install virtualenv==16.7.9
-  else
-    pip install virtualenv
-fi
-
-virtualenv --system-site-packages /usr/local/CyberPanel
-source /usr/local/CyberPanel/bin/activate
-rm -rf requirements.txt
-wget -O requirements.txt https://$GIT_CONTENT_URL/1.8.0/requirments.txt
-check_return
-pip install --ignore-installed -r requirements.txt
-check_return
-virtualenv --system-site-packages /usr/local/CyberPanel
-fi
-
 if [[ $DEV == "ON" ]] ; then
 	#install dev branch
 	#wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt
@@ -1204,6 +1181,8 @@ if [[ $DEV == "ON" ]] ; then
   source /usr/local/CyberPanel/bin/activate
   wget -O requirements.txt https://$GIT_CONTENT_URL/${BRANCH_NAME}/requirments.txt
 	check_return
+	pip3 uninstall setuptools -y
+	pip3 install setuptools==45.3.0
   pip3.6 install --ignore-installed -r requirements.txt
 	check_return
 	cd -

From a205c5a3feed3ee1a5291d23a6cce9d154e74f22 Mon Sep 17 00:00:00 2001
From: qtwrk <qtwrk555@gmail.com>
Date: Mon, 9 Mar 2020 14:30:25 +0100
Subject: [PATCH 2/2] revert

---
 cyberpanel.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index cc886b1c3..c66327def 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -1181,8 +1181,6 @@ if [[ $DEV == "ON" ]] ; then
   source /usr/local/CyberPanel/bin/activate
   wget -O requirements.txt https://$GIT_CONTENT_URL/${BRANCH_NAME}/requirments.txt
 	check_return
-	pip3 uninstall setuptools -y
-	pip3 install setuptools==45.3.0
   pip3.6 install --ignore-installed -r requirements.txt
 	check_return
 	cd -