Mercurial > hg > release > icedtea7-forest-2.4
changeset 896:dc4ec31fe96a
8011350: hgforest.sh uses non-POSIX sh features that may fail with some shells
Reviewed-by: tbell, katleman, dholmes
| author | mduigou |
|---|---|
| date | Wed, 03 Apr 2013 16:26:10 -0700 |
| parents | 159143926e11 |
| children | 4c1899b8560d |
| files | common/bin/hgforest.sh |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/common/bin/hgforest.sh Tue Apr 02 14:56:19 2013 -0700 +++ b/common/bin/hgforest.sh Wed Apr 03 16:26:10 2013 -0700 @@ -30,7 +30,7 @@ # 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 # on stdout. Much nicer. -whichhg="`which hg`" +whichhg="`which hg 2> /dev/null | grep -v '^no hg in'`" if [ "${whichhg}" = "" ] ; then echo Cannot find hg! @@ -51,7 +51,7 @@ bpython="`basename "$python"`" 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}" else echo Cannot find python from hg launcher. Running plain hg, which probably has buffered stdout.