diff --git a/README.md b/README.md index 26d811509..92515ba65 100755 --- a/README.md +++ b/README.md @@ -566,6 +566,7 @@ Supported operating systems and hardware: ### SRS 2.0 history +* v2.0, 2015-03-17, for [#155](https://github.com/winlinvip/simple-rtmp-server/issues/155), osx(darwin) support demo with nginx and ffmpeg. 2.0.143. * v2.0, 2015-03-15, start [2.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/2.0release), 80773 lines. * v2.0, 2015-03-14, fix [#324](https://github.com/winlinvip/simple-rtmp-server/issues/324), support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. * v2.0, 2015-03-14, for [#324](https://github.com/winlinvip/simple-rtmp-server/issues/324), support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. diff --git a/trunk/etc/init.d/srs-api b/trunk/etc/init.d/srs-api index dba4dc524..8d1f56e52 100755 --- a/trunk/etc/init.d/srs-api +++ b/trunk/etc/init.d/srs-api @@ -19,11 +19,11 @@ CONFIG="8085" ######################################################################## # utility functions ######################################################################## -RED="\\e[31m" -GREEN="\\e[32m" -YELLOW="\\e[33m" -BLACK="\\e[0m" -POS="\\e[60G" +RED="\\033[31m" +GREEN="\\033[32m" +YELLOW="\\033[33m" +BLACK="\\033[0m" +POS="\\033[60G" ok_msg(){ echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" diff --git a/trunk/etc/init.d/srs-demo b/trunk/etc/init.d/srs-demo index e7e2bd5eb..b02df8dd3 100755 --- a/trunk/etc/init.d/srs-demo +++ b/trunk/etc/init.d/srs-demo @@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.log' ######################################################################## # utility functions ######################################################################## -RED="\\e[31m" -GREEN="\\e[32m" -YELLOW="\\e[33m" -BLACK="\\e[0m" -POS="\\e[60G" +RED="\\033[31m" +GREEN="\\033[32m" +YELLOW="\\033[33m" +BLACK="\\033[0m" +POS="\\033[60G" ok_msg() { echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" diff --git a/trunk/etc/init.d/srs-demo-19350 b/trunk/etc/init.d/srs-demo-19350 index 704b89bdc..b23677758 100755 --- a/trunk/etc/init.d/srs-demo-19350 +++ b/trunk/etc/init.d/srs-demo-19350 @@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.19350.log' ######################################################################## # utility functions ######################################################################## -RED="\\e[31m" -GREEN="\\e[32m" -YELLOW="\\e[33m" -BLACK="\\e[0m" -POS="\\e[60G" +RED="\\033[31m" +GREEN="\\033[32m" +YELLOW="\\033[33m" +BLACK="\\033[0m" +POS="\\033[60G" ok_msg() { echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" diff --git a/trunk/scripts/run.sh b/trunk/scripts/run.sh index 4f4849547..81b65ff92 100755 --- a/trunk/scripts/run.sh +++ b/trunk/scripts/run.sh @@ -3,10 +3,10 @@ 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" +RED="\\033[31m" +GREEN="\\033[32m" +YELLOW="\\033[33m" +BLACK="\\033[0m" ./etc/init.d/srs-demo restart; ret=$?; if [[ 0 -ne $ret ]]; then echo "错误:启动SRS失败"; exit $ret; fi echo "启动SRS服务器成功" @@ -32,7 +32,8 @@ cat</dev/null 2>&1 +if [[ 0 -eq $? && `getenforce` != 'Disabled' ]]; then echo -e "${RED}请关闭selinux:${BLACK}"; echo -e "${RED} 打开配置文件:sudo vi /etc/sysconfig/selinux${BLACK}"; echo -e "${RED} 修改为:SELINUX=disabled${BLACK}"; diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index ccbe0dedb..c6e90da72 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,11 +31,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 142 +#define VERSION_REVISION 143 // server info. #define RTMP_SIG_SRS_KEY "SRS" -#define RTMP_SIG_SRS_CODE "OuXuli" +#define RTMP_SIG_SRS_CODE "ZhouGuowen" #define RTMP_SIG_SRS_ROLE "origin/edge server" #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)" #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"