X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=setup.sh;h=c1922a2883aa49244413181b1a13b74374ebd8de;hb=3f9630a6b73b6220c97852a4326c07d6f9187967;hp=197263de0aca28cd92d749de5adb1d6599c19afc;hpb=ba1e10becaa8755981364ea61deee6cf48c38fb9;p=config%2Fdotfiles.git
diff --git a/setup.sh b/setup.sh
index 197263d..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
@@ -33,11 +33,11 @@ terminal_available() {
# Usage:
apply_optional_replacement() {
if test -n "$4"; then
- echo "$1: using $2 $4"
+ printf '%s: using %s %s\n' "$1" "$2" "$4"
generate "$1" '' simple_cpp \
"$3" -- "$4"
else
- echo "$1: removing $2 display"
+ printf '%s: removing %s display\n' "$1" "$2"
grep_i -v "$3" "$1"
fi
}
@@ -82,30 +82,23 @@ fi
# shell/aliases.in for details. Doing this here instead of in shell/aliases
# speeds up shell starts.
#
-# Check if colors are available.
+# GNU ls with colors available.
if ls --color >/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.
@@ -116,8 +109,8 @@ else
fi
generate shell/aliases .in simple_cpp \
- LS_ENV LS_PATH LS_COLOR COLUMN -- \
- "$ls_env" "$ls_path" "$ls_color" "$column"
+ 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
@@ -138,9 +131,13 @@ generate screenrc .in cat
# 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
@@ -240,6 +237,11 @@ fi
# Htop overwrites the comments in its configuration file.
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
@@ -257,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
@@ -266,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
@@ -279,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