shell/aliases: Use grep --color=auto if available.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 39f706efe21fe016fbc3f5cfd5bbe5d92d60a424..3a43c3a4d702829180755e39485a24fef93913e3 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../lib.sh
 
 # Helper functions.
@@ -34,13 +36,30 @@ 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
 
-# Generate ~/.less with lesskey.
-lesskey lesskey
+# Create rlwrap history directory.
+mkdir -p shell/rlwrap
+
+
+# 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.
+echo lesskey: generating .lesskey
+perl < lesskey \
+    -e 'while (<STDIN>) {
+            s/\bHISTORY_PATH\b/$ARGV[0]/;
+            print;
+        }' \
+    "`pwd`/lesshistory" \
+    | lesskey -
 chmod 0600 ~/.less
 
 # Find the required options to get colored ls output. GNU ls is preferred. See
@@ -83,6 +102,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
@@ -152,6 +180,19 @@ fi
 if installed tmux; then
     generate perl tmux.conf ./bin/remove-continuation.pl
 
+    # Add mappings to switch to windows 10-29 quickly. See tmux-window.pl for
+    # details.
+    perl ./tmux-window.pl 1 "`pwd`/tmux-window2.conf" > tmux-window1.conf
+    perl ./tmux-window.pl 2                           > tmux-window2.conf
+    # Set absolute path to tmux-window1.conf in tmux.conf.
+    perl < tmux.conf > tmux.conf.tmp \
+        -e 'while (<STDIN>) {
+                s/\bTMUX_WINDOW_PATH\b/$ARGV[0]/;
+                print;
+            }' \
+        "`pwd`/tmux-window1.conf"
+    mv tmux.conf.tmp tmux.conf
+
     # 256 colors not available.
     if test -z "$use_256colors"; then
         echo tmux.conf: removing 256 colors
@@ -170,6 +211,15 @@ 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
 link bash ~/.bash
@@ -185,6 +235,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
@@ -196,7 +249,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