diff --git a/hacking/env-setup b/hacking/env-setup
index cc2974f430..fcf8e4d049 100755
--- a/hacking/env-setup
+++ b/hacking/env-setup
@@ -1,43 +1,30 @@
+#!/bin/bash
 # usage: source ./hacking/env-setup [-q]
 #    modifies environment for running Ansible from checkout
 
 # When run using source as directed, $0 gets set to bash, so we must use $BASH_SOURCE
-case "$0" in
-    (bash)
-        HACKING_DIR="${BASH_SOURCE%/*}";;
-    (*)
-        HACKING_DIR="${0%/*}";;
-esac
-
+if [ -n "$BASH_SOURCE" ] ; then
+    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; print(os.path.realpath('$HACKING_DIR'))")
-ANSIBLE_HOME="${FULL_PATH%/*}"
+FULL_PATH=`python -c "import os; 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"
 
-case "$PYTHONPATH" in
-  (*${PREFIX_PYTHONPATH}*) :;;
-  (*) export PYTHONPATH="$PREFIX_PYTHONPATH${PYTHONPATH:+:$PYTHONPATH}";;
-esac
-
-case "$MANPATH" in
-  (*${PREFIX_MANPATH}*) :;;
-  (*) export MANPATH="$PREFIX_MANPATH${MANPATH:+:$MANPATH}";;
-esac
-
-case "$PATH" in
-  (*${PREFIX_PATH}*) :;;
-  (*) export PATH="$PREFIX_PATH${PATH:+:$PATH}";;
-esac
-
+[[ $PYTHONPATH != ${PREFIX_PYTHONPATH}* ]] && export PYTHONPATH=$PREFIX_PYTHONPATH:$PYTHONPATH
+[[ $PATH != ${PREFIX_PATH}* ]] && export PATH=$PREFIX_PATH:$PATH
 export ANSIBLE_LIBRARY="$ANSIBLE_HOME/library"
+[[ $MANPATH != ${PREFIX_MANPATH}* ]] && export MANPATH=$PREFIX_MANPATH:$MANPATH
 
 # Print out values unless -q is set
 
-if [ $# -eq 0 ] || [ "$1" != "-q" ] ; then
+if [ $# -eq 0 -o "$1" != "-q" ] ; then
     echo ""
     echo "Setting up Ansible to run out of checkout..."
     echo ""
@@ -46,11 +33,10 @@ if [ $# -eq 0 ] || [ "$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!"
     echo ""
 fi
 
-