Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS fix #602

Merged
merged 1 commit into from Dec 8, 2018
Merged

macOS fix #602

merged 1 commit into from Dec 8, 2018

Conversation

zeilen
Copy link
Contributor

@zeilen zeilen commented Dec 4, 2018

macOS’s BSD readlink is different from GNU readlink, says: illegal option -- f

macOS’s BSD readlink is different from GNU readlink, says: illegal option -- f
@zeilen
Copy link
Contributor Author

zeilen commented Dec 6, 2018

see also: #573

@darealshinji
Copy link
Collaborator

Maybe it's better to add a check before the elif readlink -f part.
Something like this:

elif readlink --version | head -1 | grep -q GNU && readlink -f "$SHELL" 2>&1 | grep -q -i 'busybox'; then

Does this work on Mac and suppress the readlink warning?

@zeilen
Copy link
Contributor Author

zeilen commented Dec 8, 2018

Keep it simple. It’s simply not needed with my commit because the first if (line 1797) would become true in macOS too and so it would not run the elif and else code. Line 1799 runs fine.

@darealshinji darealshinji merged commit b146877 into KittyKatt:master Dec 8, 2018
@zeilen zeilen deleted the patch-1 branch December 11, 2018 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants