setup.sh: Don't use `which`.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index be42a6a017f0ed89b24b48cb5e42f95f10d6ade2..3a5e7f2f6b637d4a858f0e1333d80f30880c72e6 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
@@ -79,7 +81,7 @@ else
     fi
 fi
 # Absolute path to `ls`.
-ls_path=`which ls`
+ls_path=`installed_path ls`
 # GNU ls with colors.
 if test "x$ls_color" = xgnu; then
     ls_env=
@@ -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
@@ -119,7 +130,7 @@ if terminal_available screen-256color; then
         # rxvt-unicode binaries (e.g. Debian's rxvt-unicode-256color), the
         # terminal_info check for manual installations which modify
         # rxvt-unicode's terminfo entry.
-        urxvt_path=`which urxvt`
+        urxvt_path=`installed_path urxvt`
         urxvt_grep=`strings "$urxvt_path" | grep '^TERM=rxvt-'`
         if test x"$urxvt_grep" = 'xTERM=rxvt-unicode-256color' \
                 || terminal_info rxvt-unicode \
@@ -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