From 6219fc4932797f29d23d331bbdaa6b3eed24f230 Mon Sep 17 00:00:00 2001
From: willthames <will@musc.org.uk>
Date: Mon, 30 Jul 2012 13:10:06 +1000
Subject: [PATCH 1/2] 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 | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/hacking/env-setup b/hacking/env-setup
index b153862a940..e6d7a27b332 100755
--- a/hacking/env-setup
+++ b/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"
-PREFIX_PATH="$PWD/bin"
-PREFIX_MANPATH="$PWD/docs/man"
+# When run using source as directed, $0 gets set to bash, so we must use $BASH_SOURCE
+if [ -n "$BASH_SOURCE" ] ; then
+    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"
-echo "PYTHONPATH=$PYTHONPATH"
-echo "ANSIBLE_LIBRARY=$ANSIBLE_LIBRARY"
-echo "MANPATH=$MANPATH"
+# Print out values unless -q is set
 
-echo "Reminder: specify your host file with -i"
-echo "Done."
+if [ $# -eq 0 -o "$1" != "-q" ] ; then
+    echo "PATH=$PATH"
+    echo "PYTHONPATH=$PYTHONPATH"
+    echo "ANSIBLE_LIBRARY=$ANSIBLE_LIBRARY"
+    echo "MANPATH=$MANPATH"
+    
+    echo "Reminder: specify your host file with -i"
+    echo "Done."
+fi

From 4d4d0b90c5892ad82c1ac67ca6cd2f1424b633a6 Mon Sep 17 00:00:00 2001
From: Will Thames <will@musc.org.uk>
Date: Mon, 30 Jul 2012 21:09:53 +1000
Subject: [PATCH 2/2] readlink -f does not work on OS X. Replaced with a python
 solution

---
 hacking/env-setup | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hacking/env-setup b/hacking/env-setup
index e6d7a27b332..45c77c6fb7b 100755
--- a/hacking/env-setup
+++ b/hacking/env-setup
@@ -8,7 +8,9 @@ if [ -n "$BASH_SOURCE" ] ; then
 else
     HACKING_DIR="$PWD/hacking"
 fi
-FULL_PATH=`readlink -fn $HACKING_DIR`
+# 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"