diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh index 369fcaed6..152c0bb4f 100644 --- a/scripts/install/ubuntu.sh +++ b/scripts/install/ubuntu.sh @@ -64,18 +64,6 @@ 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 b7364666d..2ed03a3ab 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -255,6 +255,8 @@ else OSNAME='unknow' fi +VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'` +echo "${OSNAME}:${VERSION_ID}" # system judge if [ "$OSNAME" == "macos" ]; then @@ -347,7 +349,6 @@ pip3 install --upgrade setuptools cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt pip3 install gunicorn==20.1.0 -pip3 install gevent==21.1.2 pip3 install gevent-websocket==0.10.1 pip3 install requests==2.20.0 pip3 install flask-caching==1.10.1 @@ -357,6 +358,10 @@ pip3 install psutil pip3 install flask-socketio==5.2.0 pip3 install mysqlclient +if [ "${OSNAME}" == "ubuntu" ] && [ "${VERSION_ID}" == "22.04" ];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 @@ -369,7 +374,6 @@ pip3 install --upgrade setuptools pip3 install -r /www/server/mdserver-web/requirements.txt pip3 install gunicorn==20.1.0 -pip3 install gevent==21.1.2 pip3 install gevent-websocket==0.10.1 pip3 install requests==2.20.0 pip3 install flask-caching==1.10.1 @@ -379,7 +383,9 @@ pip3 install psutil pip3 install flask-socketio==5.2.0 pip3 install mysqlclient - +if [ "${OSNAME}" == "ubuntu" ] && [ "${VERSION_ID}" == "22.04" ];then + pip3 install -U --force-reinstall --no-binary :all: gevent +fi ##### common start #####