From 8105f1aae1b26c2fd8ec645eb9f3b5cd9035f899 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 30 Jun 2022 12:38:21 +0800 Subject: [PATCH] up --- scripts/install/ubuntu.sh | 12 ++++++++++++ scripts/lib.sh | 9 --------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh index 152c0bb4f..369fcaed6 100644 --- a/scripts/install/ubuntu.sh +++ b/scripts/install/ubuntu.sh @@ -64,6 +64,18 @@ cd /www/server/mdserver-web/scripts && bash lib.sh chmod 755 /www/server/mdserver-web/data +pip3 install -U --force-reinstall --no-binary :all: gevent + +if [ ! -f /www/server/mdserver-web/bin/activate ];then + cd /www/server/mdserver-web && python3 -m venv . + cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate +else + cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate +fi + +pip3 install -U --force-reinstall --no-binary :all: gevent + + cd /www/server/mdserver-web && ./cli.sh start sleep 5 diff --git a/scripts/lib.sh b/scripts/lib.sh index ca211991d..b7364666d 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -357,10 +357,6 @@ pip3 install psutil pip3 install flask-socketio==5.2.0 pip3 install mysqlclient -if [ "$OSNAME" == "ubuntu" ];then - pip3 install -U --force-reinstall --no-binary :all: gevent -fi - if [ ! -f /www/server/mdserver-web/bin/activate ];then cd /www/server/mdserver-web && python3 -m venv . cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate @@ -384,11 +380,6 @@ pip3 install flask-socketio==5.2.0 pip3 install mysqlclient -if [ "$OSNAME" == "ubuntu" ];then - pip3 install -U --force-reinstall --no-binary :all: gevent -fi - - ##### common start #####