external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

fix the sed command for arm

Browse source
This commit is contained in:
winlin 2015-10-26 13:29:59 +08:00
parent 95d38b7b29
commit 45385241bb
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/auto/depends.sh
View file

@ -513,7 +513,7 @@ if [ $__SRS_BUILD_NGINX = YES ]; then
# srs will write ts/m3u8 file use current user,
# nginx default use nobody, so cannot read the ts/m3u8 created by srs.
cp ${SRS_OBJS}/nginx/conf/nginx.conf ${SRS_OBJS}/nginx/conf/nginx.conf.bk
$SED '' "s/^.user nobody;/user `whoami`;/g" ${SRS_OBJS}/nginx/conf/nginx.conf
$SED "s/^.user nobody;/user `whoami`;/g" ${SRS_OBJS}/nginx/conf/nginx.conf
fi
# the demo dir.

4
trunk/auto/generate-srs-librtmp-single.sh
View file

@ -7,10 +7,6 @@ ret=$?; if [[ 0 -eq $ret ]]; then
fi
echo "Is OSX: ${OS_IS_OSX}"
# the sed command
SED="sed -i"
if [ $OS_IS_OSX = YES ]; then SED="sed -i ''"; fi
# when export srs-librtmp single files
# package the whole project to srs_librtmp.h and srs_librtmp.cpp
#

4
trunk/auto/setup_variables.sh
View file

@ -28,3 +28,7 @@ if [[ -z $SrsArmCXX ]]; then SrsArmCXX=$__SrsArmCXX; fi
if [[ -z $SrsArmAR ]]; then SrsArmAR=$__SrsArmAR; fi
if [[ -z $SrsArmLD ]]; then SrsArmLD=$__SrsArmLD; fi
if [[ -z $SrsArmRANDLIB ]]; then SrsArmRANDLIB=$__SrsArmRANDLIB; fi
# the sed command
SED="sed -i"
if [ $OS_IS_OSX = YES ]; then SED="sed -i ''"; fi