setup.sh: simplify ls detection

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index aeaae961be71d88ebc09b987c1e0f892bc3f9aae..d3a85d5d7d0778e06288fefcacca96bd37ea573b 100755 (executable)
--- 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,17 @@ 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_args='command ls --color'
 # 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), I use
+    # `la` for that.
+    ls_args='CLICOLOR_FORCE=1 command ls -G -I'
 # Simple ls with no colors.
 else
-    ls_env=
-    ls_color=
+    ls_args='command ls'
 fi
 
 # Also check if `column -t` is available.
@@ -106,8 +103,8 @@ else
 fi
 
 generate shell/aliases .in simple_cpp \
-    LS_ENV LS_PATH LS_COLOR COLUMN -- \
-    "$ls_env" "$ls_path" "$ls_color" "$column"
+    LS_ARGS COLUMN -- \
+    "$ls_args" "$column"
 
 # If `tig` is not available use my simple replacement.
 if ! installed tig; then
@@ -134,7 +131,7 @@ if terminal_available screen-256color; then
         echo 'screenrc: running on virtual terminal, disabling 256 colors'
     # Called through SSH connection, assume the local system supports 256
     # colors.
-    elif 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
@@ -256,6 +253,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
@@ -265,6 +266,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
@@ -276,6 +280,7 @@ if installed htop; then
     link htoprc ~/.config/htop/htoprc
 fi
 if test -d ~/.ssh && test -O ~/.ssh; then
+    mkdir -p ~/.ssh/master
     link ssh_config ~/.ssh/config
 fi
 if installed dig; then