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

diff --git a/setup.sh b/setup.sh
index 08efb21..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
 
@@ -132,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
@@ -267,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