Mercurial > hg > toybox
changeset 1149:2213cedd15b4 draft
Older python spit --version to stdout, 2.7 does it to stderr. Of course.
author | Rob Landley <rob@landley.net> |
---|---|
date | Thu, 19 Dec 2013 15:14:33 -0600 |
parents | d01ab969cc5d |
children | ac4a0cde89c2 |
files | scripts/make.sh |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/make.sh Thu Dec 19 15:11:45 2013 -0600 +++ b/scripts/make.sh Thu Dec 19 15:14:33 2013 -0600 @@ -126,7 +126,7 @@ echo "generated/help.h" # Only recreate generated/help.h if python2 is installed. Does not work with 3. -[ -z "$(python --version | grep 'Python 2')" ] && +[ -z "$(python --version 2>&1 | grep 'Python 2')" ] && PYTHON="$(which python2 || which python2.6 || which python2.7)" || PYTHON=python if [ ! -z "$(grep 'CONFIG_TOYBOX_HELP=y' $KCONFIG_CONFIG)" ];