setup.sh,shell/aliases: Only use `column -t` if it's available.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 3a5e7f2f6b637d4a858f0e1333d80f30880c72e6..6bede115a519091e3d1c2c1e24cb57f8a19b5b4e 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -95,14 +95,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