adam/prezto
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix GNU core utilities ls aliases, close #31

Browse Source
This commit is contained in:
Sorin Ionescu 2012-03-13 18:42:03 -04:00
parent 04c3df512a
commit cbffacd245
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
alias.zsh
View File

@ -8,14 +8,25 @@
setopt CORRECT # Correct commands. setopt CORRECT # Correct commands.
# The 'ls' Family # The 'ls' Family
if zstyle -t ':omz:alias:ls' color; then if (( $+commands[dircolors] )); then
if [[ -f "$HOME/.dir_colors" ]] && (( $+commands[dircolors] )); then # GNU core utilities.
alias ls='ls --group-directories-first'
if zstyle -t ':omz:alias:ls' color; then
if [[ -f "$HOME/.dir_colors" ]]; then
eval $(dircolors "$HOME/.dir_colors") eval $(dircolors "$HOME/.dir_colors")
alias ls='ls -hF --group-directories-first --color=auto' fi
alias ls="$aliases[ls] --color=auto"
else else
export CLICOLOR=1 alias ls="$aliases[ls] -F"
fi
else
# BSD core utilities.
if zstyle -t ':omz:alias:ls' color; then
export LSCOLORS="exfxcxdxbxegedabagacad" export LSCOLORS="exfxcxdxbxegedabagacad"
alias ls='ls -G -F' alias ls="ls -G"
else
alias ls='ls -F'
fi fi
fi fi

10
plugins/gnu-utils/init.zsh
View File

@ -60,11 +60,15 @@ if (( $+commands[gdircolors] )); then
} }
# A sensible default for ls. # A sensible default for ls.
if zstyle -t ':omz:alias:ls' color && [[ -f "$HOME/.dir_colors" ]]; then alias ls='ls --group-directories-first'
if zstyle -t ':omz:alias:ls' color; then
if [[ -f "$HOME/.dir_colors" ]]; then
eval $(gdircolors "$HOME/.dir_colors") eval $(gdircolors "$HOME/.dir_colors")
alias ls='ls -hF --group-directories-first --color=auto' fi
alias ls="$aliases[ls] --color=auto"
else else
alias ls='ls -hF --group-directories-first' alias ls="$aliases[ls] -F"
fi fi
fi fi