X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=3a43c3a4d702829180755e39485a24fef93913e3;hb=be84282735ce577b629d70b80e757f2a2ad5a32e;hp=adb2721ac6a95b62cf916c6d494d6dde283a4b1e;hpb=b3b0fc94f9782566977efdddd344f925c7f7522b;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index adb2721..3a43c3a 100755
--- 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
@@ -240,5 +249,8 @@ if installed tmux; then
 fi
 if installed htop; then
     link htoprc ~/.htoprc
+    # New location for htoprc. Use both for compatibility.
+    mkdir -p ~/.config/htop
+    link htoprc ~/.config/htop/htoprc
 fi