diff options
| author | Rob Landley <rob@landley.net> | 2013-12-19 15:14:33 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2013-12-19 15:14:33 -0600 |
| commit | bb5cfb270f924390c2163573cc5ed8fba9f638b8 (patch) | |
| tree | df802ca4afc81c6cc21d7f104790f96129d69f7f /scripts/make.sh | |
| parent | 10d55b112963406dec3164396b9e8378f6d63961 (diff) | |
| download | toybox-bb5cfb270f924390c2163573cc5ed8fba9f638b8.tar.gz | |
Older python spit --version to stdout, 2.7 does it to stderr. Of course.
Diffstat (limited to 'scripts/make.sh')
| -rwxr-xr-x | scripts/make.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make.sh b/scripts/make.sh index 5c86e26d..493306c5 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -126,7 +126,7 @@ GLOBSTRUCT="$(getglobals)" 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)" ]; |