From 08bffc60fb526bcf2098e05acbcb0df9cf24ad94 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 13 Mar 2020 16:29:54 +0800 Subject: [PATCH 1/3] Update install --- trunk/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/scripts/install.sh b/trunk/scripts/install.sh index 3a1c6292a..6f161b13f 100755 --- a/trunk/scripts/install.sh +++ b/trunk/scripts/install.sh @@ -23,7 +23,7 @@ ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi # check lsb_release ok_msg "check tools" lsb_release -v >/dev/null 2>&1; ret=$? -if [[ $ret -ne 0 ]]; then failed_msg "abort, please install lsb_release"; exit $ret; fi +if [[ $ret -ne 0 ]]; then failed_msg "no lsb_release, install: yum install -y redhat-lsb"; exit $ret; fi # user must stop service first. ok_msg "check previous install" From fc3704e54e8805f2fef237cee7652751e0eb12c5 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Mar 2020 14:32:49 +0800 Subject: [PATCH 2/3] Update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 317fdb762..60b0f3e17 100755 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![](https://codecov.io/gh/ossrs/srs/branch/3.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/3.0release) [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat) -SRS/3.0，[OuXuli][release3]，是一个流媒体直播集群，高效、稳定、易用，简单而快乐。
-SRS(Simple RTMP Server) is a live streaming cluster, high efficiency, stable and simple. +SRS/3.0，[OuXuli][release3]，是一个流媒体集群，支持RTMP/HLS/WebRTC/SRT/GB28181，高效、稳定、易用，简单而快乐。
+SRS(Simple RTMP Server) is a RTMP/HLS/WebRTC/SRT/GB28181 streaming cluster, high efficiency, stable and simple. > Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries which are distributed using their own licenses, please read [License Mixing][LicenseMixing]. From 446e5f9a0cac220723ea41c4b5635ba0175aa1ae Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Mar 2020 14:34:20 +0800 Subject: [PATCH 3/3] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 60b0f3e17..5a47871ee 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat) SRS/3.0，[OuXuli][release3]，是一个流媒体集群，支持RTMP/HLS/WebRTC/SRT/GB28181，高效、稳定、易用，简单而快乐。
-SRS(Simple RTMP Server) is a RTMP/HLS/WebRTC/SRT/GB28181 streaming cluster, high efficiency, stable and simple. +SRS is a RTMP/HLS/WebRTC/SRT/GB28181 streaming cluster, high efficiency, stable and simple. > Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries which are distributed using their own licenses, please read [License Mixing][LicenseMixing].