up

3 years ago · 8105f1aae1
parent 2edc467b17
commit 8105f1aae1
2 changed files with 12 additions and 9 deletions
--- 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
--- 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 #####