Update ubuntu.sh

scripts/update/ubuntu.sh

@@ -5,28 +5,69 @@ LANG=en_US.UTF-8
 
 
 
-cd /www/server/mdserver-web/scripts && ./lib.sh
+wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
+cd /tmp && unzip /tmp/master.zip
+/usr/bin/cp -rf  /tmp/mdserver-web-master/* /www/server/mdserver-web
+rm -rf /tmp/master.zip
+rm -rf /tmp/mdserver-web-master
+
+
+cd /www/server/mdserver-web/scripts && sh lib.sh
+
 chmod 755 /www/server/mdserver-web/data
 
+#venv
+cd /www/server/mdserver-web && python3 -m venv .
+
+if [ ! -f /usr/local/bin/pip3 ];then
+    python3 -m pip install --upgrade pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple
+fi
 
 if [ -f /www/server/mdserver-web/bin/activate ];then
     cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate && pip3 install -r /www/server/mdserver-web/requirements.txt
 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
 
+sh /etc/init.d/mw stop && rm -rf  /www/server/mdserver-web/scripts/init.d/mw && rm -rf  /etc/init.d/mw
+
 
 
-cd /www/server/mdserver-web && ./cli.sh start
-sleep 5
+echo -e "stop mw"
+isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
+port=$(cat /www/server/mdserver-web/data/port.pl)
+n=0
+while [[ "$isStart" != "" ]];
+do
+    echo -e ".\c"
+    sleep 0.5
+    isStart=$(lsof -n -P -i:$port|grep LISTEN|grep -v grep|awk '{print $2}'|xargs)
+    let n+=1
+    if [ $n -gt 15 ];then
+        break;
+    fi
+done
 
-cd /www/server/mdserver-web && ./cli.sh stop
-cd /www/server/mdserver-web && ./scripts/init.d/mw default
-cd /www/server/mdserver-web && ./cli.sh start
 
+echo -e "start mw"
+cd /www/server/mdserver-web && sh cli.sh start
+isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
+n=0
+while [[ ! -f /etc/init.d/mw ]];
+do
+    echo -e ".\c"
+    sleep 0.5
+    let n+=1
+    if [ $n -gt 15 ];then
+        break;
+    fi
+done
+echo -e "start mw success"
 
+/etc/init.d/mw default