X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=2280eabd43ed5337a742b20739fa7411182e2cdd;hb=43fc6ae667ca55c4c3e3a3f1dd0881a7c2c117ce;hp=ee5fed1e61feeac9ba9c0ec5b734b7a71039c939;hpb=e189acb4d63724d096f6db3b26fbedfbdcda183d;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index ee5fed1..2280eab 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
@@ -86,14 +86,19 @@ fi
 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.
@@ -104,8 +109,8 @@ else
 fi
 
 generate shell/aliases .in simple_cpp \
-    LS_ENV LS_COLOR COLUMN -- \
-    "$ls_env" "$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
@@ -267,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
@@ -278,6 +286,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