X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=06c13e9d3f99e5fd83acb81a789ca876f0787d9c;hb=6e1fdbbeba19567dc1b8bbf7f0b4bd9f3fa5c365;hp=e40249a956651eb5bbb93f7b2a1d7a3f39ea6005;hpb=a50edcee0c62258dee0d0bbce7fd655e6f864978;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index e40249a..06c13e9 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,8 +82,6 @@ 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=
@@ -106,8 +104,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 COLUMN -- \
+    "$ls_env" "$ls_color" "$column"
 
 # If `tig` is not available use my simple replacement.
 if ! installed tig; then
@@ -134,7 +132,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
@@ -269,6 +267,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