Merge pull request #4 from midoks/dev

merge

scripts/install/centos.sh

@@ -66,9 +66,8 @@ fi
 #安装时不开启
 systemctl stop firewalld
 
-yum groupinstall -y "Development Tools"
-
-yum install -y libevent libevent-devel libjpeg* libpng* gd* libxslt* unzip libmcrypt libmcrypt-devel
+# yum groupinstall -y "Development Tools"
+yum install -y libevent libevent-devel libjpeg* libpng* gd* libxslt* unzip
 yum install -y python-imaging libicu-devel zip bzip2-devel gcc libxml2 libxml2-dev  pcre pcre-devel
 yum install -y libjpeg-devel libpng-devel libwebp libwebp-devel
 yum install -y lsof net-tools
@@ -82,38 +81,40 @@ if [ ! -f /usr/local/bin/pip3 ];then
 fi
 
 
+echo  "start install lib"
 cd /www/server/mdserver-web/scripts && bash lib.sh
+echo  "end install lib"
+
+
 chmod 755 /www/server/mdserver-web/data
 
 
+echo  "start install python lib"
+
+pip install --upgrade pip
+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
+pip3 install python-socketio==4.2.0
+pip3 install psutil==5.9.1 
+pip3 install pymongo
+
+cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt
+
 if [ ! -f /www/server/mdserver-web/bin/activate ];then
-    cd /www/server/mdserver-web && python3 -m venv .
+	cd /www/server/mdserver-web && python3 -m venv .
+	sleep 5
 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
     pip install --upgrade pip
-    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
-	pip3 install python-socketio==4.2.0
-	pip3 install psutil==5.9.1 
-	pip3 install pymongo
-else
-	pip install --upgrade pip
-    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
-	pip3 install python-socketio==4.2.0
-	pip3 install psutil==5.9.1 
-	pip3 install pymongo
 fi
 
+echo  "end install python lib"
+
 
 cd /www/server/mdserver-web && ./cli.sh start
 sleep 5

scripts/install_dev.sh

@@ -72,7 +72,8 @@ if [ $OSNAME != "macos" ];then
 fi
 
 echo "use system version: ${OSNAME}"
-curl -fsSL  https://gitee.com/midoks/mdserver-web/raw/master/scripts/install/${OSNAME}.sh | bash
+
+curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install/${OSNAME}.sh | bash
 
 
 endTime=`date +%s`

scripts/update_dev.sh

@@ -52,7 +52,7 @@ rm -rf /tmp/mdserver-web-dev
 
 #pip uninstall public
 echo "use system version: ${OSNAME}"
-curl -fsSL  https://gitee.com/midoks/mdserver-web/raw/master/scripts/update/${OSNAME}.sh | bash
+curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update/${OSNAME}.sh | bash
 
 endTime=`date +%s`
 ((outTime=($endTime-$startTime)/60))