setup.sh,shell/aliases: Only use `column -t` if it's available.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 8bb0f443e939aa2a3910f119942fb5f7f058989d..6bede115a519091e3d1c2c1e24cb57f8a19b5b4e 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -36,11 +36,21 @@ if ! infocmp > /dev/null 2>&1; then
 fi
 
 
+# DIRECTORY SETUP
+
 # Create private temporary directory used by many tools (including GNU screen
 # and tmux).
 mkdir -p ~/.tmp
 chmod 0700 ~/.tmp
 
+# Create rlwrap history directory.
+mkdir -p shell/rlwrap
+# Create zsh cache directory.
+mkdir -p zsh/cache
+
+
+# FILE SETUP
+
 # Generate ~/.less with lesskey. Prevent cluttering ~/ by storing the history
 # file in this directory; this requires replacing the constant HISTORY_PATH in
 # lesskey.
@@ -71,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=
@@ -85,14 +95,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
@@ -111,7 +139,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 \
@@ -194,11 +222,8 @@ 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
 
 # Link setup for shells.
 link shell ~/.shell
@@ -215,6 +240,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
@@ -226,7 +254,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
 
-# Create rlwrap history directory.
-mkdir -p shell/rlwrap