Mercurial > ec-dotfiles
changeset 240:a6fd1f0784f5
Merge.
| author | Edho Arief <edho@myconan.net> |
|---|---|
| date | Sun, 02 Oct 2011 07:24:37 +0700 |
| parents | 5dcbf6ab0109 (diff) 73e90355bbd7 (current diff) |
| children | 443e0004a708 |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rc/bash Thu Nov 03 11:08:18 2011 +0700 +++ b/rc/bash Sun Oct 02 07:24:37 2011 +0700 @@ -35,6 +35,7 @@ _has_rm_I= _has_gnu_ls= _has_gnu_grep= +_ls="ls" case "$(uname -s)" in Linux) _has_rm_I=y @@ -59,7 +60,10 @@ export LSCOLORS=ExGxFxdxCxegedabagExEx ;; OpenBSD) - if command -v colorls > /dev/null 2>&1; then + if command -v gls > /dev/null 2>&1; then + _has_gnu_ls=y + _ls="gls" + elif command -v colorls > /dev/null 2>&1; then export CLICOLOR= export LSCOLORS=ExGxFxdxCxegedabagExEx alias ls='colorls -F' @@ -71,12 +75,13 @@ esac [ "${_has_rm_I}" = y ] && alias rm="rm -I" -[ "${_has_gnu_ls}" = y ] && alias ls="ls -F --color=auto" +[ "${_has_gnu_ls}" = y ] && alias ls="${_ls} -F --color=auto" [ "${_has_gnu_grep}" = y ] && alias grep="grep --color=auto" unset _has_rm_I unset _has_gnu_ls unset _has_gnu_grep +unset _ls case "${TERM}" in