Merge pull request #1531 from lcosmin/master
Fixed 'ls' issue on NetBSD
This commit is contained in:
commit
085af13b47
@ -7,8 +7,14 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
|
|||||||
if [ "$DISABLE_LS_COLORS" != "true" ]
|
if [ "$DISABLE_LS_COLORS" != "true" ]
|
||||||
then
|
then
|
||||||
# Find the option for using colors in ls, depending on the version: Linux or BSD
|
# Find the option for using colors in ls, depending on the version: Linux or BSD
|
||||||
|
if [[ "$(uname -s)" == "NetBSD" ]]; then
|
||||||
|
# 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
|
||||||
|
gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
|
||||||
|
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'
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
#setopt no_beep
|
#setopt no_beep
|
||||||
setopt auto_cd
|
setopt auto_cd
|
||||||
|
Loading…
Reference in New Issue
Block a user