Fix Terminals.hascolor checking on FreeBSD #20676
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
tkelman
added
system:freebsd
ararslan
reviewed
Feb 19, 2017
| @@ -156,7 +156,11 @@ else | |||
| function hascolor(t::TTYTerminal) | |||
| startswith(t.term_type, "xterm") && return true | |||
| try | |||
| return success(`tput setaf 0`) | |||
| @static if Sys.KERNEL == :FreeBSD | |||
There was a problem hiding this comment.
If this doesn't work for FreeBSD, I have a feeling it wouldn't work for Dragonfly and others, so this might be better as
@static if is_bsd() && !is_apple()There was a problem hiding this comment.
It's only for FreeBSD.
I tried OpenBSD, it's more complicate:
# TERM=rxvt tput setaf 1 && echo 'work'
work
# TERM=rxvt-256color tput setaf 1 && echo 'work'
tput: not enough arguments (3) for capability `setaf'
# TERM=rxvt-256color tput setaf 1 0 0 && echo 'work'
work
# TERM=screen tput setaf 1 && echo 'work'
work
# TERM=screen-256color tput setaf 1 && echo 'work'
tput: not enough arguments (3) for capability `setaf'
# TERM=screen-256color tput setaf 1 0 0 && echo 'work'
work
# uname -a
OpenBSD obsd.my.domain 6.0 GENERIC.MP#2319 amd64
In case of NetBSD, both tput AF and tput setaf work:
# uname -a
NetBSD 7.0.2 NetBSD 7.0.2 (GENERIC.201610210724Z) amd64
# TERM=rxvt tput setaf 1 && echo 'work'
work
# TERM=rxvt-256color tput setaf 1 && echo 'work'
work
# TERM=screen tput setaf 1 && echo 'work'
work
# TERM=screen-256color tput setaf 1 && echo 'work'
work
# TERM=screen-256color tput AF 1 && echo 'work'
work
In case of DragonFly... seems subtle. tput setaf not work, and tput AF only works on non -256color term type.
There was a problem hiding this comment.
Okay, thanks for checking. I think what you have here is fine then.
ararslan
approved these changes
Feb 20, 2017
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.
(not sure why
setafnot works :p