胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
77e652fc 1 parent 421fbd4c

refine buils nginx script

内嵌 并排对比
正在显示 1 个修改的文件 包含 8 行增加 和 12 行删除
... ... @@ -272,8 +272,7 @@ function write_nginx_html5()
END
}
__SRS_BUILD_NGINX=NO; if [ $SRS_ARM_UBUNTU12 = NO ]; then if [ $SRS_HLS = YES ]; then __SRS_BUILD_NGINX=YES; fi fi
if [ $SRS_ARM_UBUNTU12 = NO ]; then
if [ $SRS_HLS = YES ]; then
if [ $__SRS_BUILD_NGINX = YES ]; then
if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then
echo "nginx-1.5.7 is ok.";
else
... ... @@ -315,7 +314,6 @@ if [ $SRS_ARM_UBUNTU12 = NO ]; then
# nginx.html to detect whether nginx is alive
echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html
fi
fi
if [ $SRS_HLS = YES ]; then
... ... @@ -364,8 +362,7 @@ ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forwa
# only when the nginx is ok,
# if api-server not enalbed, use nginx as demo.
if [ $SRS_ARM_UBUNTU12 = NO ]; then
if [ $SRS_HLS = YES ]; then
if [ $__SRS_BUILD_NGINX = YES ]; then
if [ $SRS_HTTP_CALLBACK = YES ]; then
# override the default index.
rm -f ${SRS_OBJS}/nginx/html/index.html &&
... ... @@ -373,22 +370,21 @@ if [ $SRS_ARM_UBUNTU12 = NO ]; then
else
rm -f ${SRS_OBJS}/nginx/html/index.html &&
cat<<END >> ${SRS_OBJS}/nginx/html/index.html
<!DOCTYPE html>
<html>
<head>
<!DOCTYPE html>
<html>
<head>
<title>SRS</title>
<meta charset="utf-8">
</head>
<body>
</head>
<body>
<script type="text/javascript">
setTimeout(function(){
window.location.href = "players/index.html" + window.location.search;
}, 500);
</script>
</body>
</body>
END
fi
fi
fi
#####################################################################################
... ...