diff options
Diffstat (limited to 'shell/aliases')
| -rw-r--r-- | shell/aliases | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/shell/aliases b/shell/aliases index 143385b..a80dd22 100644 --- a/shell/aliases +++ b/shell/aliases @@ -72,27 +72,28 @@ setaliases() { } setcoloraliases() { - if [ `uname` = "Linux" ] ; then + if [ "$(uname)" = "Linux" ] ; then alias ls="ls --color=auto -F"; alias lm='ls -lh --color=force | more'; - elif [ `uname` = "FreeBSD" ] ; then + elif [ "$(uname)" = "FreeBSD" ] ; then alias ls="ls -FG"; alias lm='CLICOLOR_FORCE="1" ls -l | less -r'; fi if echo "color test" | grep -q --color=auto "color test" >/dev/null 2>&1 ; then alias grep="grep --color=auto"; - alias egrep='egrep --color=auto' - alias search='egrep --color=auto -rnI'; + alias egrep='grep -E --color=auto' + alias search='grep -E --color=auto -rnI'; fi - alias diff="$(which diff colordiff 2>/dev/null | tail -n 1)"; + #shellcheck disable=SC2139 + alias diff="$(command -v diff colordiff 2>/dev/null | tail -n 1)"; alias t='tree -CdL' } setsudoaliases() { # Prefer doas if available, as it's likely to be configured by me over sudo - _sudo="$(which doas sudo 2>/dev/null | sed 1q)" + _sudo="$(command -v doas sudo 2>/dev/null | sed 1q)" if [ -x "$_sudo" ] ; then # Package managers # Isn't it amazing how many distros you end up using? |