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

diff --git a/setup.sh b/setup.sh
index 4c14f5f..1be636c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -64,24 +64,27 @@ 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=
     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=
@@ -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
@@ -130,7 +142,7 @@ if terminal_available screen-256color; 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 \
@@ -213,12 +225,6 @@ fi
 # Htop overwrites the comments in its configuration file.
 generate cat htoprc .in
 
-# Copy remindrc template if ~/.reminders doesn't exist yet.
-if installed remind && test ! -e "$HOME/.reminders"; then
-    echo remind: copying template to .reminders
-    cp reminders.in "$HOME/.reminders"
-fi
-
 
 # LINK SETUP