From 707f2aac9342532cbc908bf31cf5992204cacd55 Mon Sep 17 00:00:00 2001 From: Nils Winkler Date: Mon, 9 Jan 2017 18:10:15 +0100 Subject: [PATCH] Added check for grep color option Closes #643 and closes #884 --- aliases/available/general.aliases.bash | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index 31e8557f..38a8bfe6 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -4,7 +4,8 @@ about-alias 'general aliases' if ls --color -d . &> /dev/null then alias ls="ls --color=auto" -else +elif ls -G -d . &> /dev/null +then alias ls='ls -G' # Compact view, show colors fi @@ -18,8 +19,13 @@ alias l1='ls -1' alias _="sudo" # colored grep -alias grep='grep --color=auto' -export GREP_COLOR='1;33' +# Need to check an existing file for a pattern that will be found to ensure +# that the check works when on an OS that supports the color option +if grep --color=auto "a" $BASH_IT/*.md &> /dev/null +then + alias grep='grep --color=auto' + export GREP_COLOR='1;33' +fi which gshuf &> /dev/null if [ $? -eq 0 ]