diff --git a/scripts/install_centos.sh b/scripts/install_centos.sh index cbe4d51ed..5891a1632 100755 --- a/scripts/install_centos.sh +++ b/scripts/install_centos.sh @@ -98,10 +98,12 @@ yum -y install python36-devel cd /www/server/mdserver-web/scripts && ./lib.sh chmod 755 /www/server/mdserver-web/data -#venv -cd /www/server/mdserver-web && python3 -m venv . -cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate && pip3 install -r /www/server/mdserver-web/requirements.txt +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 cd /www/server/mdserver-web && ./cli.sh start sleep 5 diff --git a/scripts/install_macos.sh b/scripts/install_macos.sh index 9883150ea..8270baae2 100755 --- a/scripts/install_macos.sh +++ b/scripts/install_macos.sh @@ -38,9 +38,12 @@ fi chmod 755 $DEV/server/mdserver-web/data +if [ -f $DEV/server/mdserver-web/bin/activate ];then + cd $DEV/server/mdserver-web && python3 -m venv $DEV/server/mdserver-web && source $DEV/server/mdserver-web/bin/activate && pip3 install -r $DEV/server/mdserver-web/requirements.txt +else + cd $DEV/server/mdserver-web && pip3 install -r $DEV/server/mdserver-web/requirements.txt +fi -cd $DEV/server/mdserver-web && python3 -m venv $DEV/server/mdserver-web \ -source $DEV/server/mdserver-web/bin/activate && pip install -r $DEV/server/mdserver-web/requirements.txt cd $DEV/server/mdserver-web && ./cli.sh start cd $DEV/server/mdserver-web && ./cli.sh stop diff --git a/scripts/update_centos.sh b/scripts/update_centos.sh index 283958c46..a511186a7 100755 --- a/scripts/update_centos.sh +++ b/scripts/update_centos.sh @@ -25,7 +25,12 @@ chmod 755 /www/server/mdserver-web/data #venv cd /www/server/mdserver-web && python3 -m venv . -cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate && pip3 install -r /www/server/mdserver-web/requirements.txt + +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 sh /etc/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/init.d/mw