diff --git a/scripts/install.sh b/scripts/install.sh index c74335f33..49827b7e4 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -82,10 +82,27 @@ fi echo "use system version: ${OSNAME}" cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh + + +cd /www/server/mdserver-web && bash cli.sh start +isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` +n=0 +while [[ ! -f /etc/rc.d/init.d/mw ]]; +do + echo -e ".\c" + sleep 1 + let n+=1 + if [ $n -gt 20 ];then + echo -e "start mw fail" + exit 1 + fi +done + cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw stop cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw start cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw default +sleep 2 if [ ! -e /usr/bin/mw ]; then if [ -f /etc/rc.d/init.d/mw ];then ln -s /etc/rc.d/init.d/mw /usr/bin/mw @@ -96,7 +113,3 @@ endTime=`date +%s` ((outTime=(${endTime}-${startTime})/60)) echo -e "Time consumed:\033[32m $outTime \033[0mMinute!" - -systemctl daemon-reload - - diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index bea84a9ef..3c3113c37 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -74,8 +74,7 @@ echo "use system version: ${OSNAME}" cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh - -cd /www/server/mdserver-web && ./cli.sh start +cd /www/server/mdserver-web && bash cli.sh start isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` n=0 while [[ ! -f /etc/rc.d/init.d/mw ]]; @@ -93,14 +92,14 @@ cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw stop cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw start cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw default +sleep 2 + if [ ! -e /usr/bin/mw ]; then if [ -f /etc/init.d/mw ];then ln -s /etc/rc.d/init.d/mw /usr/bin/mw fi fi -systemctl daemon-reload - endTime=`date +%s` ((outTime=(${endTime}-${startTime})/60)) echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"