# 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=
fi
fi
# Absolute path to `ls`.
-ls_path=`which ls`
+ls_path=`installed_path ls`
# GNU ls with colors.
if test "x$ls_color" = xgnu; then
ls_env=
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
# rxvt-unicode binaries (e.g. Debian's rxvt-unicode-256color), the
# terminal_info check for manual installations which modify
# rxvt-unicode's terminfo entry.
- urxvt_path=`which urxvt`
+ urxvt_path=`installed_path urxvt`
urxvt_grep=`strings "$urxvt_path" | grep '^TERM=rxvt-'`
if test x"$urxvt_grep" = 'xTERM=rxvt-unicode-256color' \
|| terminal_info rxvt-unicode \