胡斌 / 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() @@ -272,8 +272,7 @@ function write_nginx_html5()
272 END 272 END
273 } 273 }
274 __SRS_BUILD_NGINX=NO; if [ $SRS_ARM_UBUNTU12 = NO ]; then if [ $SRS_HLS = YES ]; then __SRS_BUILD_NGINX=YES; fi fi 274 __SRS_BUILD_NGINX=NO; if [ $SRS_ARM_UBUNTU12 = NO ]; then if [ $SRS_HLS = YES ]; then __SRS_BUILD_NGINX=YES; fi fi
275 -if [ $SRS_ARM_UBUNTU12 = NO ]; then  
276 - if [ $SRS_HLS = YES ]; then 275 +if [ $__SRS_BUILD_NGINX = YES ]; then
277 if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then 276 if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then
278 echo "nginx-1.5.7 is ok."; 277 echo "nginx-1.5.7 is ok.";
279 else 278 else
@@ -315,7 +314,6 @@ if [ $SRS_ARM_UBUNTU12 = NO ]; then @@ -315,7 +314,6 @@ if [ $SRS_ARM_UBUNTU12 = NO ]; then
315 314
316 # nginx.html to detect whether nginx is alive 315 # nginx.html to detect whether nginx is alive
317 echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html 316 echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html
318 - fi  
319 fi 317 fi
320 318
321 if [ $SRS_HLS = YES ]; then 319 if [ $SRS_HLS = YES ]; then
@@ -364,8 +362,7 @@ ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forwa @@ -364,8 +362,7 @@ ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forwa
364 362
365 # only when the nginx is ok, 363 # only when the nginx is ok,
366 # if api-server not enalbed, use nginx as demo. 364 # if api-server not enalbed, use nginx as demo.
367 -if [ $SRS_ARM_UBUNTU12 = NO ]; then  
368 - if [ $SRS_HLS = YES ]; then 365 +if [ $__SRS_BUILD_NGINX = YES ]; then
369 if [ $SRS_HTTP_CALLBACK = YES ]; then 366 if [ $SRS_HTTP_CALLBACK = YES ]; then
370 # override the default index. 367 # override the default index.
371 rm -f ${SRS_OBJS}/nginx/html/index.html && 368 rm -f ${SRS_OBJS}/nginx/html/index.html &&
@@ -373,22 +370,21 @@ if [ $SRS_ARM_UBUNTU12 = NO ]; then @@ -373,22 +370,21 @@ if [ $SRS_ARM_UBUNTU12 = NO ]; then
373 else 370 else
374 rm -f ${SRS_OBJS}/nginx/html/index.html && 371 rm -f ${SRS_OBJS}/nginx/html/index.html &&
375 cat<<END >> ${SRS_OBJS}/nginx/html/index.html 372 cat<<END >> ${SRS_OBJS}/nginx/html/index.html
376 - <!DOCTYPE html>  
377 - <html>  
378 - <head> 373 +<!DOCTYPE html>
  374 +<html>
  375 +<head>
379 <title>SRS</title> 376 <title>SRS</title>
380 <meta charset="utf-8"> 377 <meta charset="utf-8">
381 - </head>  
382 - <body> 378 +</head>
  379 +<body>
383 <script type="text/javascript"> 380 <script type="text/javascript">
384 setTimeout(function(){ 381 setTimeout(function(){
385 window.location.href = "players/index.html" + window.location.search; 382 window.location.href = "players/index.html" + window.location.search;
386 }, 500); 383 }, 500);
387 </script> 384 </script>
388 - </body> 385 +</body>
389 END 386 END
390 fi 387 fi
391 - fi  
392 fi 388 fi
393 389
394 ##################################################################################### 390 #####################################################################################