diff --git a/trunk/scripts/build.sh b/trunk/scripts/build.sh index 420d1888d..4ac96a308 100755 --- a/trunk/scripts/build.sh +++ b/trunk/scripts/build.sh @@ -3,8 +3,9 @@ src_dir='src' if [[ ! -d $src_dir ]]; then echo "错误:必须在src同目录执行脚本"; exit 1; fi # step 1: build srs +# nginx is not needed, we use cherrypy to delivery hls. echo "编译SRS" -./configure --x86-x64 --with-nginx && make +./configure --x86-x64 && make ret=$?; if [[ 0 -ne $ret ]]; then echo "错误:编译SRS失败"; exit $ret; fi echo "编译SRS成功" diff --git a/trunk/scripts/run.sh b/trunk/scripts/run.sh index 52cada2ee..98790c27c 100755 --- a/trunk/scripts/run.sh +++ b/trunk/scripts/run.sh @@ -8,9 +8,6 @@ GREEN="\\e[32m" YELLOW="\\e[33m" BLACK="\\e[0m" -sudo ./objs/nginx/sbin/nginx -echo "启动nginx" - ./etc/init.d/srs-demo restart; ret=$?; if [[ 0 -ne $ret ]]; then echo "错误:启动SRS失败"; exit $ret; fi echo "启动SRS服务器成功" diff --git a/trunk/scripts/stop.sh b/trunk/scripts/stop.sh index 232d1664e..714654194 100755 --- a/trunk/scripts/stop.sh +++ b/trunk/scripts/stop.sh @@ -1,8 +1,5 @@ #!/bin/bash -sudo ./objs/nginx/sbin/nginx -s stop -echo "停止nginx" - ./etc/init.d/srs-demo stop; ret=$?; if [[ 0 -ne $ret ]]; then echo "错误:停止SRS失败"; exit $ret; fi echo "停止SRS服务器成功"