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

diff --git a/setup.sh b/setup.sh
index 06c13e9..eec1ded 100755
--- a/setup.sh
+++ b/setup.sh
@@ -84,16 +84,18 @@ fi
 #
 # 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'
+# OpenBSD has no colored ls, use colorls instead.
+elif colorls -G >/dev/null 2>&1; then
+    ls_args='CLICOLOR_FORCE=1 colorls -G'
 # Simple ls with no colors.
 else
-    ls_env=
-    ls_color=
+    ls_args='command ls'
 fi
 
 # Also check if `column -t` is available.
@@ -104,8 +106,8 @@ else
 fi
 
 generate shell/aliases .in simple_cpp \
-    LS_ENV LS_COLOR COLUMN -- \
-    "$ls_env" "$ls_color" "$column"
+    LS_ARGS COLUMN -- \
+    "$ls_args" "$column"
 
 # If `tig` is not available use my simple replacement.
 if ! installed tig; then
@@ -281,6 +283,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