X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=1be636c42c91e50bc47ec3d08cfc832fca567259;hb=0caa6b97792b47b11e165b7ca2042c6e43730271;hp=3a5e7f2f6b637d4a858f0e1333d80f30880c72e6;hpb=da5c4d23313e75ade3d971dab90e9d3f0a94dd1d;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 3a5e7f2..1be636c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -64,17 +64,20 @@ perl < lesskey \
     | lesskey -
 chmod 0600 ~/.less
 
+# Custom colors for GNU ls.
+if installed dircolors; then
+    dircolors -b shell/dircolors.in > shell/dircolors
+fi
+
 # Find the required options to get colored ls output. GNU ls is preferred. See
 # shell/aliases.in for details. Doing this here instead of in shell/aliases
 # speeds up shell starts.
 #
 # Check if colors are available.
-ls --color > /dev/null 2>&1
-if test $? -eq 0; then
+if ls --color > /dev/null 2>&1; then
     ls_color=gnu
 else
-    ls -G > /dev/null 2>&1
-    if test $? -eq 0; then
+    if ls -G > /dev/null 2>&1; then
         ls_color=cli
     else
         ls_color=
@@ -95,14 +98,23 @@ else
     ls_env=
     ls_color=
 fi
+
+# Also check if `column -t` is available.
+if echo test | column -t >/dev/null 2>&1; then
+    column=' | column -t'
+else
+    column=
+fi
+
 generate perl shell/aliases \
     -e 'while (<STDIN>) {
             s/\bLS_ENV\b/$ARGV[0]/;
             s/\bLS_PATH\b/$ARGV[1]/;
             s/\bLS_COLOR\b/$ARGV[2]/;
+            s/\bCOLUMN\b/$ARGV[3]/;
             print;
         }' \
-    "$ls_env" "$ls_path" "$ls_color"
+    "$ls_env" "$ls_path" "$ls_color" "$column"
 
 # Check if grep supports --color=auto.
 if echo test | grep --color=auto test >/dev/null 2>&1; then