Merge branch 'srs.master'
This commit is contained in:
commit
65dd0f1659
|
|
@ -14,7 +14,7 @@ work_dir=`(cd ${work_dir}/.. && pwd)`
|
||||||
product_dir=$work_dir
|
product_dir=$work_dir
|
||||||
|
|
||||||
# allow start script from any dir
|
# allow start script from any dir
|
||||||
cd $work_dir
|
cd $work_dir && git checkout master
|
||||||
|
|
||||||
. ${product_dir}/scripts/_log.sh
|
. ${product_dir}/scripts/_log.sh
|
||||||
ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi
|
ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ work_dir=`(cd ${work_dir}/.. && pwd)`
|
||||||
product_dir=$work_dir
|
product_dir=$work_dir
|
||||||
|
|
||||||
# allow start script from any dir
|
# allow start script from any dir
|
||||||
cd $work_dir
|
cd $work_dir && git checkout master
|
||||||
|
|
||||||
. ${product_dir}/scripts/_log.sh
|
. ${product_dir}/scripts/_log.sh
|
||||||
ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi
|
ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user