diff options
| -rwxr-xr-x | bin/ansible-playbook | 4 | ||||
| -rwxr-xr-x | bin/ansible-vault | 4 | ||||
| -rwxr-xr-x | hacking/env-setup | 26 | ||||
| -rw-r--r-- | hacking/env-setup.fish | 10 |
4 files changed, 39 insertions, 5 deletions
diff --git a/bin/ansible-playbook b/bin/ansible-playbook index 96e87de3eb..93645903f7 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -18,8 +18,8 @@ ####################################################### -#__requires__ = ['ansible'] -#import pkg_resources +__requires__ = ['ansible'] +import pkg_resources import sys import os diff --git a/bin/ansible-vault b/bin/ansible-vault index 10da6a9ea7..3079b31d9e 100755 --- a/bin/ansible-vault +++ b/bin/ansible-vault @@ -18,8 +18,8 @@ # ansible-vault is a script that encrypts/decrypts YAML files. See # http://docs.ansible.com/playbooks_vault.html for more details. -#__requires__ = ['ansible'] -#import pkg_resources +__requires__ = ['ansible'] +import pkg_resources import os import sys diff --git a/hacking/env-setup b/hacking/env-setup index 4fed169097..59bc7c21f3 100755 --- a/hacking/env-setup +++ b/hacking/env-setup @@ -23,6 +23,30 @@ PREFIX_MANPATH="$ANSIBLE_HOME/docs/man" [[ $PATH != ${PREFIX_PATH}* ]] && export PATH=$PREFIX_PATH:$PATH [[ $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 @@ -33,7 +57,7 @@ if [ $# -eq 0 -o "$1" != "-q" ] ; then echo "PYTHONPATH=$PYTHONPATH" 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 05fb60672d..1b872f4dc0 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' |