From eef66b0db1ac6d3ca4578762e864b6b9903f7a48 Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 12 Jul 2016 14:54:06 -0400 Subject: [PATCH] Get rid of OS X path restrictions (see package/linux/dfhack) --- docs/Introduction.rst | 2 -- package/darwin/dfhack | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/Introduction.rst b/docs/Introduction.rst index 68eb4844f..3a36aa538 100644 --- a/docs/Introduction.rst +++ b/docs/Introduction.rst @@ -50,8 +50,6 @@ Installing DFhack involves copying files from a release archive into your DF folder, so that: * On Windows, ``SDL.dll`` is replaced - -Additionally, on OSX, make sure that the directories in the DF folder path do not contain any '/' or ':' characters. * On Linux or OS X, the ``dfhack`` script is placed in the same folder as the ``df`` script Uninstalling is basically the same, in reverse: diff --git a/package/darwin/dfhack b/package/darwin/dfhack index a97970801..445b600f7 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="./hack:./libs:./hack/libs" + export DYLD_FRAMEWORK_PATH="./hack:./libs:./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="./hack:./libs:./hack/libs" + export DYLD_FALLBACK_FRAMEWORK_PATH="./hack:./libs:./hack/libs" fi old_tty_settings=$(stty -g)