shell/aliases: Use grep --color=auto if available.

diff --git a/setup.sh b/setup.sh
index be42a6a017f0ed89b24b48cb5e42f95f10d6ade2..3a43c3a4d702829180755e39485a24fef93913e3 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -102,6 +102,15 @@ generate perl shell/aliases \
         }' \
     "$ls_env" "$ls_path" "$ls_color"
 
+# Check if grep supports --color=auto.
+if echo test | grep --color=auto test >/dev/null 2>&1; then
+    :
+else
+    echo 'shell/aliases: removing grep --color=auto'
+    sed '/^alias grep=/ s/^/#/' shell/aliases > shell/aliases.tmp
+    mv shell/aliases.tmp shell/aliases
+fi
+
 generate cat screenrc .in
 # As screen-256color is not widely supported use it only on machines where the
 # matching terminfo entry is available. This also requires a terminal emulator

diff --git a/shell/aliases.in b/shell/aliases.in
index fa7616294b6da940007a2e5fca780825bf48a1d8..c7e234e62dc44b56e680b4965cea484c82a2b79a 100644 (file)
--- a/shell/aliases.in
+++ b/shell/aliases.in
@@ -79,6 +79,9 @@ alias du='du -shc'
 # Use human readable sizes.
 alias df='df -h'
 
+# Highlight matched strings. Doesn't work with a pager!
+alias grep='grep --color=auto'
+
 # Edit the mercurial patch queue series file for the current mercurial
 # repository in Vim. Also change Vim's pwd to the patches directory so other
 # patches can easily be opened.