X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=6e2a68e556ca8fb2cfe3939f2861cfe4cb65d2a4;hb=e64c8f9669ae521b3c5a536692c1f4751dc92a41;hp=44074f0a0767732289e8e808e5cb1a53e2d075d1;hpb=7c442e3d0aaa99822844838cd18a0a3b24892bbb;p=config%2Fdotfiles.git
diff --git a/setup.sh b/setup.sh
index 44074f0..6e2a68e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,6 +18,8 @@
# along with this program. If not, see .
+set -e
+
. ../lib.sh
# Helper functions.
@@ -34,13 +36,32 @@ 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
+# 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.
+echo lesskey: generating .lesskey
+perl < lesskey \
+ -e 'while () {
+ 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 +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
@@ -101,7 +131,7 @@ if terminal_available screen-256color; then
# terminal_info check for manual installations which modify
# rxvt-unicode's terminfo entry.
urxvt_path=`which urxvt`
- urxvt_grep=`strings "$urxvt_path" | grep '^TERM=rxvt-')`
+ urxvt_grep=`strings "$urxvt_path" | grep '^TERM=rxvt-'`
if test x"$urxvt_grep" = 'xTERM=rxvt-unicode-256color' \
|| terminal_info rxvt-unicode \
| grep -F 'colors#256' >/dev/null; then
@@ -152,6 +182,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 () {
+ 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 +213,9 @@ fi
# Htop overwrites the comments in its configuration file.
generate cat htoprc .in
+
+# LINK SETUP
+
# Link setup for shells.
link shell ~/.shell
link bash ~/.bash
@@ -185,6 +231,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 +245,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