cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add detection of python3 to hacking/env-setup (#17357)

Browse source 
People can still override the detection using PYTHON_BIN
This commit is contained in:
Michael Scherer 2016-09-02 21:11:38 +02:00 committed by Toshio Kuratomi
parent 7728d70bea
commit 619f3d13ef
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hacking/env-setup
View file

@ -5,6 +5,9 @@
PYTHONPATH=${PYTHONPATH-""} PYTHONPATH=${PYTHONPATH-""}
PATH=${PATH-""} PATH=${PATH-""}
MANPATH=${MANPATH-""} MANPATH=${MANPATH-""}
PYTHON=$(which python 2>/dev/null || which python3 2>/dev/null)
PYTHON_BIN=${PYTHON_BIN-$PYTHON}
verbosity=${1-info} # Defaults to `info' if unspecified verbosity=${1-info} # Defaults to `info' if unspecified
if [ "$verbosity" = -q ]; then if [ "$verbosity" = -q ]; then
@ -24,7 +27,7 @@ else
fi fi
# The below is an alternative to readlink -fn which doesn't exist on OS X # The below is an alternative to readlink -fn which doesn't exist on OS X
# Source: http://stackoverflow.com/a/1678636 # Source: http://stackoverflow.com/a/1678636
FULL_PATH=$(python -c "import os; print(os.path.realpath('$HACKING_DIR'))") FULL_PATH=$($PYTHON_BIN -c "import os; print(os.path.realpath('$HACKING_DIR'))")
export ANSIBLE_HOME="$(dirname "$FULL_PATH")" export ANSIBLE_HOME="$(dirname "$FULL_PATH")"
PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib" PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib"
@ -45,7 +48,7 @@ gen_egg_info()
if [ -e "$PREFIX_PYTHONPATH/ansible.egg-info" ] ; then if [ -e "$PREFIX_PYTHONPATH/ansible.egg-info" ] ; then
\rm -rf "$PREFIX_PYTHONPATH/ansible.egg-info" \rm -rf "$PREFIX_PYTHONPATH/ansible.egg-info"
fi fi
python setup.py egg_info $PYTHON_BIN setup.py egg_info
} }
if [ "$ANSIBLE_HOME" != "$PWD" ] ; then if [ "$ANSIBLE_HOME" != "$PWD" ] ; then