提交 fd711114 编写于 作者: M mduigou

8011350: hgforest.sh uses non-POSIX sh features that may fail with some shells

Reviewed-by: tbell, katleman, dholmes
上级 b61233d5
...@@ -30,7 +30,7 @@ pull_extra_base="$2" ...@@ -30,7 +30,7 @@ pull_extra_base="$2"
# Python always buffers stdout significantly, thus we will not see any output from hg clone jdk, # Python always buffers stdout significantly, thus we will not see any output from hg clone jdk,
# until a lot of time has passed! By passing -u to python, we get incremental updates # until a lot of time has passed! By passing -u to python, we get incremental updates
# on stdout. Much nicer. # on stdout. Much nicer.
whichhg="`which hg`" whichhg="`which hg 2> /dev/null | grep -v '^no hg in'`"
if [ "${whichhg}" = "" ] ; then if [ "${whichhg}" = "" ] ; then
echo Cannot find hg! echo Cannot find hg!
...@@ -51,7 +51,7 @@ if [ "#!" = "$has_hash_bang" ] ; then ...@@ -51,7 +51,7 @@ if [ "#!" = "$has_hash_bang" ] ; then
bpython="`basename "$python"`" bpython="`basename "$python"`"
fi fi
if [ -x "$python" -a ! -d "$python" -a "`${python} -V 2>&1 | cut -f 1 -d " "`" == "Python" ] ; then if [ -x "$python" -a ! -d "$python" -a "`${python} -V 2>&1 | cut -f 1 -d ' '`" = "Python" ] ; then
hg="${python} -u ${whichhg}" hg="${python} -u ${whichhg}"
else else
echo Cannot find python from hg launcher. Running plain hg, which probably has buffered stdout. echo Cannot find python from hg launcher. Running plain hg, which probably has buffered stdout.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册