diff --git a/hacking/env-setup b/hacking/env-setup
index f91259750fc..39b0f31a676 100755
--- a/hacking/env-setup
+++ b/hacking/env-setup
@@ -4,9 +4,9 @@
 
 # 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)
-elif [ $(basename $0) = "env-setup" ]; then
-    HACKING_DIR=$(dirname $0)
+    HACKING_DIR=$(dirname "$BASH_SOURCE")
+elif [ $(basename "$0") = "env-setup" ]; then
+    HACKING_DIR=$(dirname "$0")
 else
     HACKING_DIR="$PWD/hacking"
 fi