X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=setup.sh;h=c1922a2883aa49244413181b1a13b74374ebd8de;hb=3f9630a6b73b6220c97852a4326c07d6f9187967;hp=d7d0cbdfe039099c9dd987ddd30cc8764bef08ed;hpb=4c6c14ab6bef478138a3a659cf59776f31ccd407;p=config%2Fdotfiles.git
diff --git a/setup.sh b/setup.sh
index d7d0cbd..c1922a2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,7 +2,7 @@
# Setup script for shell configuration files.
-# Copyright (C) 2011-2012 Simon Ruderich
+# Copyright (C) 2011-2014 Simon Ruderich
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
# along with this program. If not, see .
-set -e
+set -eu
. ../lib.sh
@@ -30,8 +30,16 @@ terminal_info() {
terminal_available() {
terminal_info "$@" > /dev/null
}
-grep_i() {
- cmd_i grep "$@"
+# 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
@@ -59,12 +67,8 @@ mkdir -p zsh/cache
# 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" \
+simple_cpp /dev/null 2>&1; then
- ls_color=gnu
-else
- if ls -G >/dev/null 2>&1; then
- ls_color=cli
- else
- ls_color=
- fi
-fi
-# Absolute path to `ls`.
-ls_path=`installed_path 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_options=
+# Normal (BSD) ls with colors available.
+elif ls -G >/dev/null 2>&1; then
ls_env='CLICOLOR_FORCE=1'
ls_color='-G'
+ # Don't display hidden files by default when running as root. I use `la`
+ # for that.
+ ls_options='-I'
# Simple ls with no colors.
else
ls_env=
ls_color=
+ ls_options=
fi
# Also check if `column -t` is available.
@@ -111,15 +108,9 @@ else
column=
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]/;
- s/\bCOLUMN\b/$ARGV[3]/;
- print;
- }' \
- "$ls_env" "$ls_path" "$ls_color" "$column"
+generate shell/aliases .in simple_cpp \
+ LS_ENV LS_COLOR LS_OPTIONS COLUMN -- \
+ "$ls_env" "$ls_color" "$ls_options" "$column"
# If `tig` is not available use my simple replacement.
if ! installed tig; then
@@ -134,15 +125,19 @@ else
sed_i '/^alias grep=/ s/^/#/' shell/aliases
fi
-generate cat screenrc .in
+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.
use_256colors=
if terminal_available screen-256color; then
+ # GNU/Linux's virtual terminal doesn't support 256 colors. If setup.sh is
+ # run one one, assume this user is mostly used from the terminal.
+ if test x"$TERM" = xlinux || test x"$TERM" = xscreen.linux; then
+ echo 'screenrc: running on virtual terminal, disabling 256 colors'
# Called through SSH connection, assume the local system supports 256
# colors.
- if test -n "$SSH_CONNECTION"; then
+ elif test -n "${SSH_CONNECTION:+set}"; then
use_256colors=1
# We have rxvt-unicode installed, check if it supports 256 colors.
elif installed urxvt; then
@@ -189,27 +184,42 @@ if installed rxvt; then
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_i -v '(BATTERY)' 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.
- perl tmux.conf.tmp \
- -e 'while () {
- s/\bTMUX_WINDOW_PATH\b/$ARGV[0]/;
- print;
- }' \
- "`pwd`/tmux-window1.conf"
- mv tmux.conf.tmp tmux.conf
+ generate tmux.conf '' simple_cpp \
+ TMUX_WINDOW_PATH -- "`pwd`/tmux-window1.conf"
# 256 colors not available.
if test -z "$use_256colors"; then
@@ -225,7 +235,12 @@ if installed tmux; then
fi
# Htop overwrites the comments in its configuration file.
-generate cat htoprc .in
+generate htoprc .in cat
+
+if installed dig; then
+ # dig doesn't support any comments in digrc.
+ grep -v -E '^#' digrc.in >digrc
+fi
# LINK SETUP
@@ -244,6 +259,10 @@ link zsh/env ~/.zshenv
link zsh/rc ~/.zshrc
link zsh/logout ~/.zlogout
+if installed tmux; then
+ link terminfo ~/.terminfo
+fi
+
# Link setup for additional files.
if installed crontab; then
link crontab.d ~/.crontab.d
@@ -253,6 +272,9 @@ if installed colordiff; then
link colordiffrc ~/.colordiffrc
fi
link inputrc ~/.inputrc
+if installed ghci; then
+ link haskeline ~/.haskeline
+fi
link screenrc ~/.screenrc
if installed tmux; then
link tmux.conf ~/.tmux.conf
@@ -266,3 +288,6 @@ fi
if test -d ~/.ssh && test -O ~/.ssh; then
link ssh_config ~/.ssh/config
fi
+if installed dig; then
+ link digrc ~/.digrc
+fi