From 5880ffbce8b3b2e2d6b4bf2e2600527280d3199d Mon Sep 17 00:00:00 2001 From: Mitch Riedstra Date: Sat, 3 Feb 2018 15:26:20 -0500 Subject: Fall back to regular diff if colordiff isn't available. Default to -F on ls aliases --- mkshrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mkshrc') diff --git a/mkshrc b/mkshrc index 9be5faf..a9a6c0d 100644 --- a/mkshrc +++ b/mkshrc @@ -103,8 +103,8 @@ fi #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% setaliases() { alias ls="ls -F"; - alias l="ls -lh"; - alias ll="ls -l"; + alias l="ls -lhF"; + alias ll="ls -lhF"; alias g="grep"; alias m="$PAGER"; alias j="jobs"; @@ -127,7 +127,7 @@ setcoloraliases() { fi alias grep="grep --color=auto"; - alias diff='colordiff'; + alias diff="$(which diff colordiff 2>/dev/null | tail -n 1)"; alias search='egrep --color=auto -rnI'; alias t='tree -CdL' } -- cgit v1.2.3