Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
5e45c167
Commit
5e45c167
authored
Sep 19, 2015
by
Robby Russell
Browse files
Merge pull request #2751 from drm00/fix-openbsd-colorls
add check for colored ls on openbsd. (retry of #2225)
parents
cc53e4cb
f516b7c7
Changes
1
Show whitespace changes
Inline
Side-by-side
lib/theme-and-appearance.zsh
View file @
5e45c167
...
@@ -11,8 +11,11 @@ then
...
@@ -11,8 +11,11 @@ then
# otherwise, leave ls as is, because NetBSD's ls doesn't support -G
# otherwise, leave ls as is, because NetBSD's ls doesn't support -G
gls
--color
-d
.
&>/dev/null 2>&1
&&
alias ls
=
'gls --color=tty'
gls
--color
-d
.
&>/dev/null 2>&1
&&
alias ls
=
'gls --color=tty'
elif
[[
"
$(
uname
-s
)
"
==
"OpenBSD"
]]
;
then
elif
[[
"
$(
uname
-s
)
"
==
"OpenBSD"
]]
;
then
# On OpenBSD, test if "colorls" is installed (this one supports colors);
# On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base,
# otherwise, leave ls as is, because OpenBSD's ls doesn't support -G
# with color and multibyte support) are available from ports. "colorls"
# will be installed on purpose and can't be pulled in by installing
# coreutils, so prefer it to "gls".
gls
--color
-d
.
&>/dev/null 2>&1
&&
alias ls
=
'gls --color=tty'
colorls
-G
-d
.
&>/dev/null 2>&1
&&
alias ls
=
'colorls -G'
colorls
-G
-d
.
&>/dev/null 2>&1
&&
alias ls
=
'colorls -G'
else
else
ls
--color
-d
.
&>/dev/null 2>&1
&&
alias ls
=
'ls --color=tty'
||
alias ls
=
'ls -G'
ls
--color
-d
.
&>/dev/null 2>&1
&&
alias ls
=
'ls --color=tty'
||
alias ls
=
'ls -G'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment