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

env-setup now takes a -q argument to run in quiet mode

hacking/env-setup

@@ -1,20 +1,33 @@
 #!/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
+FULL_PATH=`readlink -fn $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
 
-echo "PATH=$PATH"
+# Print out values unless -q is set
-echo "PYTHONPATH=$PYTHONPATH"
+
-echo "ANSIBLE_LIBRARY=$ANSIBLE_LIBRARY"
+if [ $# -eq 0 -o "$1" != "-q" ] ; then
-echo "MANPATH=$MANPATH"
+    echo "PATH=$PATH"
+    echo "PYTHONPATH=$PYTHONPATH"
+    echo "ANSIBLE_LIBRARY=$ANSIBLE_LIBRARY"
+    echo "MANPATH=$MANPATH"
     
-echo "Reminder: specify your host file with -i"
+    echo "Reminder: specify your host file with -i"
-echo "Done."
+    echo "Done."
+fi