正在显示
3 个修改的文件
包含
5 行增加
和
5 行删除
@@ -513,7 +513,7 @@ if [ $__SRS_BUILD_NGINX = YES ]; then | @@ -513,7 +513,7 @@ if [ $__SRS_BUILD_NGINX = YES ]; then | ||
513 | # srs will write ts/m3u8 file use current user, | 513 | # srs will write ts/m3u8 file use current user, |
514 | # nginx default use nobody, so cannot read the ts/m3u8 created by srs. | 514 | # nginx default use nobody, so cannot read the ts/m3u8 created by srs. |
515 | cp ${SRS_OBJS}/nginx/conf/nginx.conf ${SRS_OBJS}/nginx/conf/nginx.conf.bk | 515 | cp ${SRS_OBJS}/nginx/conf/nginx.conf ${SRS_OBJS}/nginx/conf/nginx.conf.bk |
516 | - $SED '' "s/^.user nobody;/user `whoami`;/g" ${SRS_OBJS}/nginx/conf/nginx.conf | 516 | + $SED "s/^.user nobody;/user `whoami`;/g" ${SRS_OBJS}/nginx/conf/nginx.conf |
517 | fi | 517 | fi |
518 | 518 | ||
519 | # the demo dir. | 519 | # the demo dir. |
@@ -7,10 +7,6 @@ ret=$?; if [[ 0 -eq $ret ]]; then | @@ -7,10 +7,6 @@ ret=$?; if [[ 0 -eq $ret ]]; then | ||
7 | fi | 7 | fi |
8 | echo "Is OSX: ${OS_IS_OSX}" | 8 | echo "Is OSX: ${OS_IS_OSX}" |
9 | 9 | ||
10 | -# the sed command | ||
11 | -SED="sed -i" | ||
12 | -if [ $OS_IS_OSX = YES ]; then SED="sed -i ''"; fi | ||
13 | - | ||
14 | # when export srs-librtmp single files | 10 | # when export srs-librtmp single files |
15 | # package the whole project to srs_librtmp.h and srs_librtmp.cpp | 11 | # package the whole project to srs_librtmp.h and srs_librtmp.cpp |
16 | # | 12 | # |
@@ -28,3 +28,7 @@ if [[ -z $SrsArmCXX ]]; then SrsArmCXX=$__SrsArmCXX; fi | @@ -28,3 +28,7 @@ if [[ -z $SrsArmCXX ]]; then SrsArmCXX=$__SrsArmCXX; fi | ||
28 | if [[ -z $SrsArmAR ]]; then SrsArmAR=$__SrsArmAR; fi | 28 | if [[ -z $SrsArmAR ]]; then SrsArmAR=$__SrsArmAR; fi |
29 | if [[ -z $SrsArmLD ]]; then SrsArmLD=$__SrsArmLD; fi | 29 | if [[ -z $SrsArmLD ]]; then SrsArmLD=$__SrsArmLD; fi |
30 | if [[ -z $SrsArmRANDLIB ]]; then SrsArmRANDLIB=$__SrsArmRANDLIB; fi | 30 | if [[ -z $SrsArmRANDLIB ]]; then SrsArmRANDLIB=$__SrsArmRANDLIB; fi |
31 | + | ||
32 | +# the sed command | ||
33 | +SED="sed -i" | ||
34 | +if [ $OS_IS_OSX = YES ]; then SED="sed -i ''"; fi |
-
请 注册 或 登录 后发表评论