Get demo working on OS X El Capitan #4
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timj
force-pushed
the
tickets/DM-3200
branch
from
4df51ca
to
5dfd81c
Compare
| @@ -1,5 +1,12 @@ | |||
| #!/bin/bash | |||
|
|
|||
| # On OS X El Capitan we need to pass through the library load path | |||
| if [[ $(uname -s) = Darwin* ]]; then | |||
| if test -z "$DYLD_LIBRARY_PATH"; then | |||
There was a problem hiding this comment.
Using []'s is probably a hair more idiomatic thees days but this is fine as-is. [[]] could also be used in this case since the shell is specified as bash instead of bourne.
|
👍 |
* Pass library loader path through (it is stripped when bash is started) * Call "export-results" explicitly via Python rather than relying on /usr/bin/env
timj
force-pushed
the
tickets/DM-3200
branch
from
5dfd81c
to
547e5dc
Compare
timj
added a commit
that referenced
this pull request
Nov 16, 2015
Get demo working on OS X El Capitan
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
is started)
on /usr/bin/env