shell/aliases: Drop old Mercurial alias vqs.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index d8c00fdee11499a214007c05086bac3e746efe33..4c14f5f4abcff775dd02bb44bd3344846ddfb4d1 100755 (executable)
--- 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
@@ -226,6 +237,9 @@ link zsh/rc ~/.zshrc
 link zsh/logout ~/.zlogout
 
 # Link setup for additional files.
+if installed crontab; then
+    link crontab.d ~/.crontab.d
+fi
 link lessfilter ~/.lessfilter
 if installed colordiff; then
     link colordiffrc ~/.colordiffrc
@@ -237,5 +251,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