From f097cf671a4c682c9cf8c5ebb29b33cafe7a9ba4 Mon Sep 17 00:00:00 2001 From: midoks Date: Sat, 11 Jun 2022 02:18:21 +0800 Subject: [PATCH] up --- README.md | 4 ++-- scripts/install/ubuntu.sh | 5 ++--- scripts/update/ubuntu.sh | 7 +++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 38666d10f..c73728a0e 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,13 @@ ### 自动安装 ``` -curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | sh +curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | bash ``` ### 更新 ``` -curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | sh +curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash ``` ### 无图不真相 diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh index bd6e272dc..59901a320 100644 --- a/scripts/install/ubuntu.sh +++ b/scripts/install/ubuntu.sh @@ -79,6 +79,8 @@ if [ ! -f /usr/local/bin/pip3 ];then python3 -m pip install --upgrade pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple fi +pip3 install gevent flask gunicorn flask_caching flask_session +pip3 install flask_socketio gevent-websocket psutil cd /www/server/mdserver-web/scripts && ./lib.sh chmod 755 /www/server/mdserver-web/data @@ -90,9 +92,6 @@ else cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt fi -# pip3 install gevent flask gunicorn flask_caching flask_session -# pip3 install flask_socketio gevent-websocket psutil - cd /www/server/mdserver-web && ./cli.sh start sleep 5 diff --git a/scripts/update/ubuntu.sh b/scripts/update/ubuntu.sh index f2f044846..f76e51f89 100644 --- a/scripts/update/ubuntu.sh +++ b/scripts/update/ubuntu.sh @@ -20,6 +20,10 @@ chmod 755 /www/server/mdserver-web/data #venv cd /www/server/mdserver-web && python3 -m venv . + +pip3 install gevent flask gunicorn flask_caching flask_session +pip3 install flask_socketio gevent-websocket psutil + if [ ! -f /usr/local/bin/pip3 ];then python3 -m pip install --upgrade pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple fi @@ -31,8 +35,7 @@ else cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt fi -# pip3 install gevent flask gunicorn flask_caching flask_session -# pip3 install flask_socketio gevent-websocket psutil + sh /etc/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/init.d/mw