X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=setup.sh;h=d8c00fdee11499a214007c05086bac3e746efe33;hb=660bd92f28c522138775a62d5ef64e01ad3b8c06;hp=cc77d54e5a6c7b6a450ad69e7f030e907e4c2475;hpb=0b60017e21b2b4d2253d1b3dc2d97341db0555e4;p=config%2Fdotfiles.git
diff --git a/setup.sh b/setup.sh
index cc77d54..d8c00fd 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,15 +36,72 @@ 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 () {
+ 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
+# shell/aliases.in for details. Doing this here instead of in shell/aliases
+# speeds up shell starts.
+#
+# Check if colors are available.
+ls --color > /dev/null 2>&1
+if test $? -eq 0; then
+ ls_color=gnu
+else
+ ls -G > /dev/null 2>&1
+ if test $? -eq 0; then
+ ls_color=cli
+ else
+ ls_color=
+ fi
+fi
+# Absolute path to `ls`.
+ls_path=`which ls`
+# GNU ls with colors.
+if test "x$ls_color" = xgnu; then
+ ls_env=
+ ls_color='--color'
+# Normal (BSD) ls with colors.
+elif test "x$ls_color" = xcli; then
+ ls_env='CLICOLOR_FORCE=1'
+ ls_color='-G'
+# Simple ls with no colors.
+else
+ ls_env=
+ ls_color=
+fi
+generate perl shell/aliases \
+ -e 'while () {
+ s/\bLS_ENV\b/$ARGV[0]/;
+ s/\bLS_PATH\b/$ARGV[1]/;
+ s/\bLS_COLOR\b/$ARGV[2]/;
+ print;
+ }' \
+ "$ls_env" "$ls_path" "$ls_color"
+
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
@@ -61,7 +120,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
@@ -89,7 +148,7 @@ fi
# I use some features of GNU screen which are only in Git or very recent GNU
# screen versions. Drop them on machines which have older versions. They are
# marked as "(GIT)".
-if test -d "$HOME/development/shell/screen"; then
+if test ! -d "$HOME/development/shell/screen"; then
echo screenrc: removing Git features
grep -v '(GIT)' screenrc > screenrc.tmp
mv screenrc.tmp screenrc
@@ -112,6 +171,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
@@ -130,6 +202,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
@@ -158,5 +239,3 @@ if installed htop; then
link htoprc ~/.htoprc
fi
-# Create rlwrap history directory.
-mkdir -p shell/rlwrap