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
Ohmyzsh
Commits
c24dfa1a
Commit
c24dfa1a
authored
Oct 11, 2016
by
Marc Cornellà
Browse files
Fix ls coloring in MacOS if gls is not installed
Fixes #5520.
parent
628d0bb1
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/theme-and-appearance.zsh
View file @
c24dfa1a
...
@@ -6,7 +6,7 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
...
@@ -6,7 +6,7 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
if
[[
"
$DISABLE_LS_COLORS
"
!=
"true"
]]
;
then
if
[[
"
$DISABLE_LS_COLORS
"
!=
"true"
]]
;
then
# Find the option for using colors in ls, depending on the version
# Find the option for using colors in ls, depending on the version
if
[[
"
$OSTYPE
"
==
netbsd
*
]]
||
[[
"
$OSTYPE
"
==
darwin
*
]]
;
then
if
[[
"
$OSTYPE
"
==
netbsd
*
]]
;
then
# On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors);
# On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors);
# 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
&&
alias ls
=
'gls --color=tty'
gls
--color
-d
.
&>/dev/null
&&
alias ls
=
'gls --color=tty'
...
@@ -17,6 +17,8 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
...
@@ -17,6 +17,8 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
# coreutils, so prefer it to "gls".
# coreutils, so prefer it to "gls".
gls
--color
-d
.
&>/dev/null
&&
alias ls
=
'gls --color=tty'
gls
--color
-d
.
&>/dev/null
&&
alias ls
=
'gls --color=tty'
colorls
-G
-d
.
&>/dev/null
&&
alias ls
=
'colorls -G'
colorls
-G
-d
.
&>/dev/null
&&
alias ls
=
'colorls -G'
elif
[[
"
$OSTYPE
"
==
darwin
*
]]
;
then
gls
--color
-d
.
&>/dev/null
&&
alias ls
=
'gls --color=tty'
||
alias ls
=
'ls -G'
else
else
# For GNU ls, we use the default ls color theme. They can later be overwritten by themes.
# For GNU ls, we use the default ls color theme. They can later be overwritten by themes.
if
[[
-z
"
$LS_COLORS
"
]]
;
then
if
[[
-z
"
$LS_COLORS
"
]]
;
then
...
...
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