From ed96725293671eb2f42763c9f0dc6a6355382e44 Mon Sep 17 00:00:00 2001
From: Matthew Lindner <mattlindn@gmail.com>
Date: Wed, 29 Jun 2016 09:44:42 -0400
Subject: [PATCH] Add protection from spaces in path and add warning in
 documentation

---
 docs/Introduction.rst | 2 ++
 package/darwin/dfhack | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index 64b6b36a5..9c4a276d2 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -52,6 +52,8 @@ into your DF folder, so that:
 * On Windows, ``SDL.dll`` is replaced
 * On Linux or OSX, the ``dfhack`` script is placed in the same folder as the ``df`` script
 
+Additionally, on OSX, make sure that the directories in the DF folder path do not contain any '/' or ':' characters.
+
 Uninstalling is basically the same, in reverse:
 
 * On Windows, replace ``SDL.dll`` with ``SDLreal.dll``, then remove the DFHack files.
diff --git a/package/darwin/dfhack b/package/darwin/dfhack
index 66b574cf8..a97970801 100755
--- a/package/darwin/dfhack
+++ b/package/darwin/dfhack
@@ -4,11 +4,11 @@ cd "${PWD}"
 #thanks to Iriel for figuring this out
 OSREV=`uname -r | cut -d. -f1`
 if [ "$OSREV" -ge 11 ] ; then
-	export DYLD_LIBRARY_PATH=${PWD}/hack:${PWD}/libs:${PWD}/hack/libs
-	export DYLD_FRAMEWORK_PATH=${PWD}/hack:${PWD}/libs:${PWD}/hack/libs
+	export DYLD_LIBRARY_PATH="${PWD}/hack:${PWD}/libs:${PWD}/hack/libs"
+	export DYLD_FRAMEWORK_PATH="${PWD}/hack:${PWD}/libs:${PWD}/hack/libs"
 else
-	export DYLD_FALLBACK_LIBRARY_PATH=${PWD}/hack:${PWD}/libs:${PWD}/hack/libs
-	export DYLD_FALLBACK_FRAMEWORK_PATH=${PWD}/hack:${PWD}/libs:${PWD}/hack/libs
+	export DYLD_FALLBACK_LIBRARY_PATH="${PWD}/hack:${PWD}/libs:${PWD}/hack/libs"
+	export DYLD_FALLBACK_FRAMEWORK_PATH="${PWD}/hack:${PWD}/libs:${PWD}/hack/libs"
 fi
 
 old_tty_settings=$(stty -g)