X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=c1922a2883aa49244413181b1a13b74374ebd8de;hb=9df13622741df2a99bd4067157486098638610b8;hp=bc3bd2221a5cba6c6431008074a0247af1d8e2f2;hpb=4453828578cf549be4354479f826a2336c3697ad;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index bc3bd22..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 <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 . ../lib.sh
 
@@ -82,20 +82,23 @@ fi
 # shell/aliases.in for details. Doing this here instead of in shell/aliases
 # speeds up shell starts.
 #
-# Absolute path to `ls`.
-ls_path=`installed_path ls`
 # GNU ls with colors available.
 if ls --color >/dev/null 2>&1; then
     ls_env=
     ls_color='--color'
+    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.
@@ -106,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
@@ -128,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
@@ -230,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
 
@@ -247,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
@@ -256,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
@@ -269,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