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

diff --git a/setup.sh b/setup.sh
index adb2721..6e2a68e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -45,6 +45,8 @@ chmod 0700 ~/.tmp
 
 # Create rlwrap history directory.
 mkdir -p shell/rlwrap
+# Create zsh cache directory.
+mkdir -p zsh/cache
 
 
 # FILE SETUP
@@ -102,6 +104,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
@@ -202,12 +213,6 @@ fi
 # Htop overwrites the comments in its configuration file.
 generate cat htoprc .in
 
-# Copy remindrc template if ~/.reminders doesn't exist yet.
-if installed remind && test ! -e "$HOME/.reminders"; then
-    echo remind: copying template to .reminders
-    cp reminders.in "$HOME/.reminders"
-fi
-
 
 # LINK SETUP
 
@@ -240,5 +245,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