From ef7853d7f7f4e211d5651a98009f2c68efb2352e Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 20 Mar 2014 15:15:46 +0800 Subject: [PATCH] fix demo bug, remove the api server static-dir when link to nginx --- trunk/auto/depends.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 3b9ed2bd2..48ba5c56b 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -356,16 +356,17 @@ else fi echo "link players to cherrypy static-dir" -rm -f research/api-server/static-dir/players && +rm -rf research/api-server/static-dir/players && ln -sf `pwd`/research/players research/api-server/static-dir/players && rm -f research/api-server/static-dir/crossdomain.xml && ln -sf `pwd`/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml && -rm -f research/api-server/static-dir/live && +rm -rf research/api-server/static-dir/live && mkdir -p `pwd`/${SRS_OBJS}/nginx/html/live && ln -sf `pwd`/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live && -rm -f research/api-server/static-dir/forward && +rm -rf research/api-server/static-dir/forward && mkdir -p `pwd`/${SRS_OBJS}/nginx/html/forward && ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward +ret=$?; if [[ $ret -ne 0 ]]; then echo "link players to cherrypy static-dir failed, ret=$ret"; exit $ret; fi # only when the nginx is ok, # if api-server not enalbed, use nginx as demo.