diff --git a/hacking/env-setup b/hacking/env-setup index 6e4de1af72..032611b2ae 100755 --- a/hacking/env-setup +++ b/hacking/env-setup @@ -25,6 +25,30 @@ unset ANSIBLE_LIBRARY export ANSIBLE_LIBRARY="$ANSIBLE_HOME/library:`python $HACKING_DIR/get_library.py`" [[ $MANPATH != ${PREFIX_MANPATH}* ]] && export MANPATH=$PREFIX_MANPATH:$MANPATH +# +# Generate egg_info so that pkg_resources works +# + +# Do the work in a function so we don't repeat ourselves later +gen_egg_info() +{ + python setup.py egg_info + if [ -e $PREFIX_PYTHONPATH/ansible*.egg-info ] ; then + rm -r $PREFIX_PYTHONPATH/ansible*.egg-info + fi + mv ansible*.egg-info $PREFIX_PYTHONPATH +} + +# In some shells if pushd is a no-op then popd sends you to a previous +# directory in history +if [ "$ANSIBLE_HOME" != "$PWD" ] ; then + pushd "$ANSIBLE_HOME" + gen_egg_info + popd +else + gen_egg_info +fi + # Print out values unless -q is set if [ $# -eq 0 -o "$1" != "-q" ] ; then @@ -36,7 +60,7 @@ if [ $# -eq 0 -o "$1" != "-q" ] ; then echo "ANSIBLE_LIBRARY=$ANSIBLE_LIBRARY" echo "MANPATH=$MANPATH" echo "" - + echo "Remember, you may wish to specify your host file with -i" echo "" echo "Done!" diff --git a/hacking/env-setup.fish b/hacking/env-setup.fish index 1613baeb14..0caa055efa 100644 --- a/hacking/env-setup.fish +++ b/hacking/env-setup.fish @@ -36,6 +36,16 @@ end set -gx ANSIBLE_LIBRARY $ANSIBLE_HOME/library +# Generate egg_info so that pkg_resources works +pushd $ANSIBLE_HOME +python setup.py egg_info +if test -e $PREFIX_PYTHONPATH/ansible*.egg-info + rm -r $PREFIX_PYTHONPATH/ansible*.egg-info +end +mv ansible*egg-info $PREFIX_PYTHONPATH +popd + + if set -q argv switch $argv case '-q' '--quiet'