setup.sh: Fix ls color detection.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index be42a6a017f0ed89b24b48cb5e42f95f10d6ade2..538663d3cee39a13af4eba7e818bd2ee93ea3d22 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
@@ -67,19 +69,17 @@ chmod 0600 ~/.less
 # speeds up shell starts.
 #
 # Check if colors are available.
-ls --color > /dev/null 2>&1
-if test $? -eq 0; then
+if ls --color > /dev/null 2>&1; then
     ls_color=gnu
 else
-    ls -G > /dev/null 2>&1
-    if test $? -eq 0; then
+    if ls -G > /dev/null 2>&1; then
         ls_color=cli
     else
         ls_color=
     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=
@@ -93,14 +93,32 @@ else
     ls_env=
     ls_color=
 fi
+
+# Also check if `column -t` is available.
+if echo test | column -t >/dev/null 2>&1; then
+    column=' | column -t'
+else
+    column=
+fi
+
 generate perl shell/aliases \
     -e 'while (<STDIN>) {
             s/\bLS_ENV\b/$ARGV[0]/;
             s/\bLS_PATH\b/$ARGV[1]/;
             s/\bLS_COLOR\b/$ARGV[2]/;
+            s/\bCOLUMN\b/$ARGV[3]/;
             print;
         }' \
-    "$ls_env" "$ls_path" "$ls_color"
+    "$ls_env" "$ls_path" "$ls_color" "$column"
+
+# 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
@@ -119,7 +137,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 +220,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