From 99bf5f09ad715f7c420724827ea68e8e1406ae09 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 9 Jan 2017 17:51:12 +0100
Subject: [PATCH 1/3] Moved grep alias to general aliases

---
 aliases/available/general.aliases.bash | 4 ++++
 lib/appearance.bash                    | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 99939386..611d8a12 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -11,6 +11,10 @@ alias l1='ls -1'
 
 alias _="sudo"
 
+# colored grep
+alias grep='grep --color=auto'
+export GREP_COLOR='1;33'
+
 if [ $(uname) = "Linux" ]
 then
   alias ls="ls --color=auto"
diff --git a/lib/appearance.bash b/lib/appearance.bash
index 4270f7e4..48134c98 100644
--- a/lib/appearance.bash
+++ b/lib/appearance.bash
@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-# colored grep
-alias grep='grep --color=auto'
-export GREP_COLOR='1;33'
-
 # colored ls
 export LSCOLORS='Gxfxcxdxdxegedabagacad'
 

From c64dd0a44d515881f8e34b232cc9d32dccbd4156 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 9 Jan 2017 17:54:35 +0100
Subject: [PATCH 2/3] Fixing `ls` alias definition

Closes #819 and closes #643
---
 aliases/available/general.aliases.bash | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 611d8a12..31e8557f 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -1,9 +1,15 @@
 cite about-alias
 about-alias 'general aliases'
 
+if ls --color -d . &> /dev/null
+then
+  alias ls="ls --color=auto"
+else
+  alias ls='ls -G'        # Compact view, show colors
+fi
+
 # List directory contents
 alias sl=ls
-alias ls='ls -G'        # Compact view, show colors
 alias la='ls -AF'       # Compact view, show hidden
 alias ll='ls -al'
 alias l='ls -a'
@@ -15,10 +21,6 @@ alias _="sudo"
 alias grep='grep --color=auto'
 export GREP_COLOR='1;33'
 
-if [ $(uname) = "Linux" ]
-then
-  alias ls="ls --color=auto"
-fi
 which gshuf &> /dev/null
 if [ $? -eq 0 ]
 then

From 707f2aac9342532cbc908bf31cf5992204cacd55 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 9 Jan 2017 18:10:15 +0100
Subject: [PATCH 3/3] 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 ]