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

diff --git a/setup.sh b/setup.sh
index 2280eab..eec1ded 100755
--- a/setup.sh
+++ b/setup.sh
@@ -84,21 +84,18 @@ fi
 #
 # GNU ls with colors available.
 if ls --color >/dev/null 2>&1; then
-    ls_env=
-    ls_color='--color'
-    ls_options=
+    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 use `la`
-    # for that.
-    ls_options='-I'
+    # 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_options=
+    ls_args='command ls'
 fi
 
 # Also check if `column -t` is available.
@@ -109,8 +106,8 @@ else
 fi
 
 generate shell/aliases .in simple_cpp \
-    LS_ENV LS_COLOR LS_OPTIONS COLUMN -- \
-    "$ls_env" "$ls_color" "$ls_options" "$column"
+    LS_ARGS COLUMN -- \
+    "$ls_args" "$column"
 
 # If `tig` is not available use my simple replacement.
 if ! installed tig; then