commit 6bc14f8c6c60838b5f334da9eaea4a5e0ef29b46 parent f78153ea2a9a8bfd7fb227fed8e3400336313327 Author: Chris Bracken <chris@bracken.jp> Date: Wed, 6 May 2020 10:26:04 -0700 Clean up .aliases file Eliminate some duplication. Also gets rid of the use of dircolors. Diffstat:
| M | .aliases | | | 21 | +++++++-------------- |
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/.aliases b/.aliases @@ -2,18 +2,15 @@ # ~/.aliases # add colour -if [[ -x '/usr/bin/dircolors' || \ - -x '$HOME/.homebrew/opt/coreutils/libexec/gnubin/dircolors' ]]; then - if [[ -r "~/.dircolors" ]]; then - eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - fi - alias ls='ls -F --color=auto' - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -elif [[ "$(uname)" == FreeBSD || "$(uname)" == Darwin ]]; then +if [[ "$(uname)" == FreeBSD || "$(uname)" == Darwin ]]; then alias ls='ls -FG' +elif [[ "$(uname)" == Linux ]]; then + alias ls='ls -F --color=auto' fi +alias grep='grep --color=auto' +alias fgrep='fgrep --color=auto' +alias egrep='egrep --color=auto' +alias ag='ag --color-line-number "30;33" --color-path "30;32" --color-match "1;31"' # more ls aliases alias ll='ls -l' @@ -24,7 +21,3 @@ alias l='ls -C' alias cp='cp -i' alias mv='mv -i' alias rm='rm -i' - -# enable colour -alias grep='grep --color=auto' -alias ag='ag --color-line-number "30;33" --color-path "30;32" --color-match "1;31"'