refine the build result.

winlin
Commit 47e173bf24f46110bb600ed4e5fb35305a931097 47e173bf 1 parent 2cefe1a9
README.md
trunk/research/players/srs_player.html
trunk/scripts/_step.start.ffmpeg.demo.sh
trunk/scripts/_step.start.ffmpeg.players.sh
trunk/scripts/dev.sh
trunk/scripts/run.sh
--- a/README.md
查看文件 @47e173b
+++ b/README.md
查看文件 @47e173b
@@ -29,15 +29,7 @@ bash scripts/build.sh
 <pre>
 bash scripts/run.sh
 </pre>
-<strong>step 2:</strong> srs live show: [http://demo.srs.com/players](http://demo.srs.com/players) <br/>
-requires client add server ip to hosts. <br/>
-<pre>
-# edit the folowing file:
-# linux: /etc/hosts
-# windows: C:\Windows\System32\drivers\etc\hosts
-# where server ip is 192.168.2.111
-192.168.2.111 demo.srs.com
-</pre>
+<strong>step 2:</strong> srs live show: [http://your-server-ip](http://your-server-ip) <br/>
 <strong>step 3:</strong> stop srs demo<br/>
 <pre>
 bash scripts/stop.sh
--- a/trunk/research/players/srs_player.html
查看文件 @47e173b
+++ b/trunk/research/players/srs_player.html
查看文件 @47e173b
@@ -317,7 +317,7 @@
                 </div>
                 <div id="collapse10" class="accordion-body collapse">
                     <div class="accordion-inner">
-                        <a href="#" id="srs_publish_hls">http://demo.srs.com/live/livestream.m3u8</a> <br/>
+                        <a href="#" id="srs_publish_hls" target="_blank">http://demo.srs.com/live/livestream.m3u8</a> <br/>
                         <span>对用户的流进行HLS切片（若编码为非H264/AAC，HLS流会自动禁用）。</span>
                     </div>
                 </div>
@@ -343,7 +343,7 @@
                 </div>
                 <div id="collapse11" class="accordion-body collapse">
                     <div class="accordion-inner">
-                        <a href="#" id="srs_publish_ld_hls">http://demo.srs.com/live/livestream_ld.m3u8</a> <br/>
+                        <a href="#" id="srs_publish_ld_hls" target="_blank">http://demo.srs.com/live/livestream_ld.m3u8</a> <br/>
                         <span>对转码配置LD流进行HLS切片。</span>
                     </div>
                 </div>
@@ -369,7 +369,7 @@
                 </div>
                 <div id="collapse12" class="accordion-body collapse">
                     <div class="accordion-inner">
-                        <a href="#" id="srs_publish_sd_hls">http://demo.srs.com/live/livestream_sd.m3u8</a> <br/>
+                        <a href="#" id="srs_publish_sd_hls" target="_blank">http://demo.srs.com/live/livestream_sd.m3u8</a> <br/>
                         <span>对转码配置SD流进行HLS切片。</span>
                     </div>
                 </div>
@@ -395,7 +395,7 @@
                 </div>
                 <div id="collapse13" class="accordion-body collapse">
                     <div class="accordion-inner">
-                        <a href="#" id="srs_publish_fw_hls">http://demo.srs.com/forward/live/livestream.m3u8</a> <br/>
+                        <a href="#" id="srs_publish_fw_hls" target="_blank">http://demo.srs.com/forward/live/livestream.m3u8</a> <br/>
                         <span>对转发原始流进行HLS切片（若编码为非H264/AAC，HLS流会自动禁用）。</span>
                     </div>
                 </div>
@@ -421,7 +421,7 @@
                 </div>
                 <div id="collapse14" class="accordion-body collapse">
                     <div class="accordion-inner">
-                        <a href="#" id="srs_publish_fw_ld_hls">http://demo.srs.com/forward/live/livestream_ld.m3u8</a> <br/>
+                        <a href="#" id="srs_publish_fw_ld_hls" target="_blank">http://demo.srs.com/forward/live/livestream_ld.m3u8</a> <br/>
                         <span>对转发转码配置LD流进行HLS切片，所有转发的流会自动支持HLS。</span>
                     </div>
                 </div>
@@ -447,7 +447,7 @@
                 </div>
                 <div id="collapse15" class="accordion-body collapse">
                     <div class="accordion-inner">
-                        <a href="#" id="srs_publish_fw_sd_hls">http://demo.srs.com/forward/live/livestream_sd.m3u8</a> <br/>
+                        <a href="#" id="srs_publish_fw_sd_hls" target="_blank">http://demo.srs.com/forward/live/livestream_sd.m3u8</a> <br/>
                         <span>对转发转码配置SD流进行HLS切片，所有转发的流会自动支持HLS。</span>
                     </div>
                 </div>
--- a/trunk/scripts/_step.start.ffmpeg.demo.sh
查看文件 @47e173b
+++ b/trunk/scripts/_step.start.ffmpeg.demo.sh
查看文件 @47e173b
@@ -2,10 +2,10 @@
 src_dir='src'
 if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本"; exit 1; fi
-cmd="nohup bash ./scripts/ffmpeg.demo.sh >./objs/logs/ffmpeg-demo.log 2>&1 &"
+cmd="nohup bash ./scripts/_ffmpeg.demo.sh >./objs/logs/ffmpeg-demo.log 2>&1 &"
 echo "启动FFMPEG推送demo流(播放器上12路演示)：$cmd"
-pids=`ps aux|grep scripts|grep "/ffmpeg.demo.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; kill -s SIGKILL $pid; done
-nohup bash ./scripts/ffmpeg.demo.sh >./objs/logs/ffmpeg-demo.log 2>&1 &
+pids=`ps aux|grep scripts|grep "/_ffmpeg.demo.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; kill -s SIGKILL $pid; done
+nohup bash ./scripts/_ffmpeg.demo.sh >./objs/logs/ffmpeg-demo.log 2>&1 &
 ret=$?; if [[ 0 -ne $ret ]]; then echo "错误：启动FFMPEG推送demo流(播放器上12路演示)失败"; exit $ret; fi
 echo "启动FFMPEG推送demo流(播放器上12路演示)成功"
--- a/trunk/scripts/_step.start.ffmpeg.players.sh
查看文件 @47e173b
+++ b/trunk/scripts/_step.start.ffmpeg.players.sh
查看文件 @47e173b
@@ -2,10 +2,10 @@
 src_dir='src'
 if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本"; exit 1; fi
-cmd="nohup bash scripts/ffmpeg.players.sh >./objs/logs/ffmpeg-players.log 2>&1 &"
+cmd="nohup bash ./scripts/_ffmpeg.players.sh >./objs/logs/ffmpeg-players.log 2>&1 &"
 echo "启动FFMPEG推送players流(播放器上演示用)：$cmd"
-pids=`ps aux|grep scripts|grep "/ffmpeg.players.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; kill -s SIGKILL $pid; done
-nohup bash scripts/ffmpeg.players.sh >./objs/logs/ffmpeg-players.log 2>&1 &
+pids=`ps aux|grep scripts|grep "/_ffmpeg.players.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; kill -s SIGKILL $pid; done
+nohup bash ./scripts/_ffmpeg.players.sh >./objs/logs/ffmpeg-players.log 2>&1 &
 ret=$?; if [[ 0 -ne $ret ]]; then echo "错误：启动FFMPEG推送players流(播放器上演示用)失败"; exit $ret; fi
 echo "启动FFMPEG推送players流(播放器上演示用)成功"
--- a/trunk/scripts/dev.sh
查看文件 @47e173b
+++ b/trunk/scripts/dev.sh
查看文件 @47e173b
@@ -2,6 +2,12 @@
 src_dir='src'
 if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本"; exit 1; fi
+# linux shell color support.
+RED="\\e[31m"
+GREEN="\\e[32m"
+YELLOW="\\e[33m"
+BLACK="\\e[0m"
+
 # step 1: build srs 
 #bash scripts/_step.build.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi
@@ -24,7 +30,13 @@ bash scripts/_step.start.api.server.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $
 #bash scripts/_step.start.ffmpeg.players.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi
 # step 8: add server ip to client hosts as demo. 
-cat<<END
-SRS系统开发环境启动成功
-默认的播放器流演示：http://dev/players
-END
+ip=`ifconfig|grep "inet"|grep "addr"|grep "Mask"|grep -v "127.0.0.1"|awk 'NR==1 {print $2}'|awk -F ':' '{print $2}'`
+echo -e "${GREEN}SRS系统开发环境启动成功${BLACK}"
+echo -e "${BLACK}播放器演示：${BLACK}"
+echo -e "${RED}    http://$ip/players/srs_player.html?vhost=players${BLACK}"
+echo -e "${BLACK}编码器演示：${BLACK}"
+echo -e "${RED}    http://$ip/players/srs_publisher.html?vhost=players${BLACK}"
+echo -e "${BLACK}视频会议演示：${BLACK}"
+echo -e "${RED}    http://$ip/players/srs_chat.html?vhost=players${BLACK}"
+echo -e "${BLACK}服务器测速演示：${BLACK}"
+echo -e "${RED}    http://$ip/players/srs_bwt.html?vhost=players${BLACK}"
--- a/trunk/scripts/run.sh
查看文件 @47e173b
+++ b/trunk/scripts/run.sh
查看文件 @47e173b
@@ -2,6 +2,12 @@
 src_dir='src'
 if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本"; exit 1; fi
+# linux shell color support.
+RED="\\e[31m"
+GREEN="\\e[32m"
+YELLOW="\\e[33m"
+BLACK="\\e[0m"
+
 # step 1: build srs 
 #bash scripts/_step.build.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi
@@ -24,15 +30,16 @@ bash scripts/_step.start.ffmpeg.demo.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit 
 bash scripts/_step.start.ffmpeg.players.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi
 # step 8: add server ip to client hosts as demo. 
+ip=`ifconfig|grep "inet"|grep "addr"|grep "Mask"|grep -v "127.0.0.1"|awk 'NR==1 {print $2}'|awk -F ':' '{print $2}'`
 cat<<END
-SRS系统启动成功，您需要在客户端机器设置hosts后即可观看演示：
-    # edit the folowing file:
-    # linux: /etc/hosts
-    # windows: C:\Windows\System32\drivers\etc\hosts
-    # where server ip is 192.168.2.111
-    192.168.2.111 demo.srs.com
-默认的12路流演示：http://demo.srs.com/players
-默认的播放器流演示：http://demo.srs.com/players/srs_player.html?vhost=players
-推流（主播）应用演示：http://demo.srs.com/players/srs_publisher.html?vhost=players
-视频会议（聊天室）应用演示：http://demo.srs.com/players/srs_chat.html?vhost=players
+默认的12路流演示：
+    http://$ip/players
+默认的播放器流演示：
+    http://$ip/players/srs_player.html?vhost=players
+推流（主播）应用演示：
+    http://$ip/players/srs_publisher.html?vhost=players
+视频会议（聊天室）应用演示：
+    http://$ip/players/srs_chat.html?vhost=players
 END
+echo -e "${GREEN}演示地址：${BLACK}"
+echo -e "${RED}    http://$ip${BLACK}"