Merge pull request #714 from willthames/envsetup

env-setup no longer needs to be run from the ansible directory, it can b...

hacking/env-setup

@@ -1,16 +1,30 @@
 #!/bin/bash
-# usage: source ./hacking/env-setup
+# usage: source ./hacking/env-setup [-q]
 #    modifies environment for running Ansible from checkout
 
-PREFIX_PYTHONPATH="$PWD/lib"
+# When run using source as directed, $0 gets set to bash, so we must use $BASH_SOURCE
-PREFIX_PATH="$PWD/bin"
+if [ -n "$BASH_SOURCE" ] ; then
-PREFIX_MANPATH="$PWD/docs/man"
+    HACKING_DIR=`dirname $BASH_SOURCE`
+else
+    HACKING_DIR="$PWD/hacking"
+fi
+# The below is an alternative to readlink -fn which doesn't exist on OS X
+# Source: http://stackoverflow.com/a/1678636
+FULL_PATH=`python -c "import os, sys; print os.path.realpath('$HACKING_DIR')"`
+ANSIBLE_HOME=`dirname $FULL_PATH`
+
+PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib"
+PREFIX_PATH="$ANSIBLE_HOME/bin"
+PREFIX_MANPATH="$ANSIBLE_HOME/docs/man"
 
 export PYTHONPATH=$PREFIX_PYTHONPATH:$PYTHONPATH
 export PATH=$PREFIX_PATH:$PATH
-export ANSIBLE_LIBRARY="$PWD/library"
+export ANSIBLE_LIBRARY="$ANSIBLE_HOME/library"
 export MANPATH=$PREFIX_MANPATH:$MANPATH
 
+# Print out values unless -q is set
+
+if [ $# -eq 0 -o "$1" != "-q" ] ; then
     echo "PATH=$PATH"
     echo "PYTHONPATH=$PYTHONPATH"
     echo "ANSIBLE_LIBRARY=$ANSIBLE_LIBRARY"
@@ -18,3 +32,4 @@ echo "MANPATH=$MANPATH"
     
     echo "Reminder: specify your host file with -i"
     echo "Done."
+fi