X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=bc3bd2221a5cba6c6431008074a0247af1d8e2f2;hb=8f71f32aa3e89e59258a90b93c79a7280397e8c5;hp=39f706efe21fe016fbc3f5cfd5bbe5d92d60a424;hpb=1434bb718d186e575f79cb9a9b04ebf4ca29aef2;p=config%2Fdotfiles.git
diff --git a/setup.sh b/setup.sh
index 39f706e..bc3bd22 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,8 +18,11 @@
# along with this program. If not, see .
+set -e
+
. ../lib.sh
+
# Helper functions.
terminal_info() {
infocmp "$@" 2>&1
@@ -27,46 +30,66 @@ terminal_info() {
terminal_available() {
terminal_info "$@" > /dev/null
}
+# Usage:
+apply_optional_replacement() {
+ if test -n "$4"; then
+ printf '%s: using %s %s\n' "$1" "$2" "$4"
+ generate "$1" '' simple_cpp \
+ "$3" -- "$4"
+ else
+ printf '%s: removing %s display\n' "$1" "$2"
+ grep_i -v "$3" "$1"
+ fi
+}
# Check if `infocmp` is available.
-if ! infocmp > /dev/null 2>&1; then
+if ! infocmp >/dev/null 2>&1; then
echo 'Warning: `infocmp` not available! 256color checks will fail.'
echo
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'
+simple_cpp shell/dircolors
+ dircolors -b shell/dircolors.in >>shell/dircolors
+fi
+
# 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_path=`installed_path ls`
+# GNU ls with colors available.
+if ls --color >/dev/null 2>&1; then
ls_env=
ls_color='--color'
-# Normal (BSD) ls with colors.
-elif test "x$ls_color" = xcli; then
+# Normal (BSD) ls with colors available.
+elif ls -G >/dev/null 2>&1; then
ls_env='CLICOLOR_FORCE=1'
ls_color='-G'
# Simple ls with no colors.
@@ -74,16 +97,32 @@ 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
+# Also check if `column -t` is available.
+if echo test | column -t >/dev/null 2>&1; then
+ column=' | column -t'
+else
+ column=
+fi
+
+generate shell/aliases .in simple_cpp \
+ LS_ENV LS_PATH LS_COLOR COLUMN -- \
+ "$ls_env" "$ls_path" "$ls_color" "$column"
+
+# If `tig` is not available use my simple replacement.
+if ! installed tig; then
+ echo "alias tig='git tig'" >>shell/aliases
+fi
+
+# 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_i '/^alias grep=/ s/^/#/' shell/aliases
+fi
+
+generate screenrc .in cat
# 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
# which supports 256 colors. Also used for tmux.
@@ -100,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 \
@@ -114,61 +153,85 @@ if terminal_available screen-256color; then
fi
fi
if test -z "$use_256colors"; then
- echo screenrc: removing 256 colors
- sed 's/Enable 256 color/Disable 256 color/;
- s/screen-256color/screen/' screenrc > screenrc.tmp
- mv screenrc.tmp screenrc
+ echo 'screenrc: removing 256 colors'
+ sed_i 's/Enable 256 color/Disable 256 color/;
+ s/screen-256color/screen/' screenrc
fi
# Some options are only necessary when running as root. They are marked as
# "(ROOT)".
if test "`id -u`" -ne 0; then
- echo screenrc: removing root options
- grep -v '(ROOT)' screenrc > screenrc.tmp
- mv screenrc.tmp screenrc
+ echo 'screenrc: removing root options'
+ grep_i -v '(ROOT)' screenrc
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
- echo screenrc: removing Git features
- grep -v '(GIT)' screenrc > screenrc.tmp
- mv screenrc.tmp screenrc
+ echo 'screenrc: removing Git features'
+ grep_i -v '(GIT)' screenrc
fi
# Rxvt doesn't need the attrcolor "fix". As I prefer rxvt assume I use it when
# it's installed.
if installed rxvt; then
- echo screenrc: removing attrcolor \"fix\"
- sed 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc > screenrc.tmp
- mv screenrc.tmp screenrc
+ echo 'screenrc: removing attrcolor "fix"'
+ sed_i 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc
fi
# Display current battery charge on computers with a battery. Necessary lines
-# are marked as "(BATTERY)".
-if test ! -d /sys/class/power_supply/BAT0; then
- echo screenrc: removing battery display
- grep -v '(BATTERY)' screenrc > screenrc.tmp
- mv screenrc.tmp screenrc
+# are marked as "(BATTERY)". Also used for Tmux.
+battery=
+for x in /sys/class/power_supply/BAT*; do
+ test -d "$x" || continue
+ battery="$x"
+done
+apply_optional_replacement screenrc \
+ battery BATTERY "$battery"
+# Display current temperature. Necessary lines are marked as "(TEMPERATURE)".
+# Also used for Tmux.
+temperature=/sys/devices/platform/coretemp.0
+if ! test -d "$temperature"; then
+ temperature=
fi
+apply_optional_replacement screenrc \
+ temperature TEMPERATURE "$temperature"
+
if installed tmux; then
- generate perl tmux.conf ./bin/remove-continuation.pl
+ generate tmux.conf .in cat
+
+ apply_optional_replacement tmux.conf \
+ battery BATTERY "$battery"
+ apply_optional_replacement tmux.conf \
+ temperature TEMPERATURE "$temperature"
+
+ # Old Tmux versions can't handle that.
+ generate 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.
+ generate tmux.conf '' simple_cpp \
+ TMUX_WINDOW_PATH -- "`pwd`/tmux-window1.conf"
# 256 colors not available.
if test -z "$use_256colors"; then
- echo tmux.conf: removing 256 colors
- sed 's/Enable 256 color/Disable 256 color/;
- s/screen-256color/screen/' tmux.conf > tmux.conf.tmp
- mv tmux.conf.tmp tmux.conf
+ echo 'tmux.conf: removing 256 colors'
+ sed_i 's/Enable 256 color/Disable 256 color/;
+ s/screen-256color/screen/' tmux.conf
fi
# Tmux doesn't display a warning if the shell wasn't found!
if test ! -x '/bin/zsh'; then
- echo tmux.conf: removing /bin/zsh as shell
- sed 's/zsh/sh/' tmux.conf > tmux.conf.tmp
- mv tmux.conf.tmp tmux.conf
+ echo 'tmux.conf: removing /bin/zsh as shell'
+ sed_i 's/zsh/sh/' tmux.conf
fi
fi
# Htop overwrites the comments in its configuration file.
-generate cat htoprc .in
+generate htoprc .in cat
+
+
+# LINK SETUP
# Link setup for shells.
link shell ~/.shell
@@ -185,6 +248,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 +262,10 @@ 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
+if test -d ~/.ssh && test -O ~/.ssh; then
+ link ssh_config ~/.ssh/config
fi
-
-# Create rlwrap history directory.
-mkdir -p shell/rlwrap