shell/aliases: use `command`

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 197263de0aca28cd92d749de5adb1d6599c19afc..08efb21e3da725828b957307d14bc633ded08f9b 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -33,11 +33,11 @@ terminal_available() {
 # Usage: <file> <name> <grep-string> <value>
 apply_optional_replacement() {
     if test -n "$4"; then
-        echo "$1: using $2 $4"
+        printf '%s: using %s %s\n' "$1" "$2" "$4"
         generate "$1" '' simple_cpp \
             "$3" -- "$4"
     else
-        echo "$1: removing $2 display"
+        printf '%s: removing %s display\n' "$1" "$2"
         grep_i -v "$3" "$1"
     fi
 }
@@ -82,24 +82,12 @@ fi
 # shell/aliases.in for details. Doing this here instead of in shell/aliases
 # speeds up shell starts.
 #
-# Check if colors are available.
+# GNU ls with colors available.
 if ls --color >/dev/null 2>&1; then
-    ls_color=gnu
-else
-    if ls -G >/dev/null 2>&1; then
-        ls_color=cli
-    else
-        ls_color=
-    fi
-fi
-# Absolute path to `ls`.
-ls_path=`installed_path ls`
-# GNU ls with colors.
-if test "x$ls_color" = xgnu; then
     ls_env=
     ls_color='--color'
-# Normal (BSD) ls with colors.
-elif test "x$ls_color" = xcli; then
+# Normal (BSD) ls with colors available.
+elif ls -G >/dev/null 2>&1; then
     ls_env='CLICOLOR_FORCE=1'
     ls_color='-G'
 # Simple ls with no colors.
@@ -116,8 +104,8 @@ else
 fi
 
 generate shell/aliases .in simple_cpp \
-    LS_ENV LS_PATH LS_COLOR COLUMN -- \
-    "$ls_env" "$ls_path" "$ls_color" "$column"
+    LS_ENV LS_COLOR COLUMN -- \
+    "$ls_env" "$ls_color" "$column"
 
 # If `tig` is not available use my simple replacement.
 if ! installed tig; then
@@ -138,9 +126,13 @@ generate screenrc .in cat
 # which supports 256 colors. Also used for tmux.
 use_256colors=
 if terminal_available screen-256color; then
+    # GNU/Linux's virtual terminal doesn't support 256 colors. If setup.sh is
+    # run one one, assume this user is mostly used from the terminal.
+    if test x"$TERM" = xlinux || test x"$TERM" = xscreen.linux; then
+        echo 'screenrc: running on virtual terminal, disabling 256 colors'
     # Called through SSH connection, assume the local system supports 256
     # colors.
-    if test -n "$SSH_CONNECTION"; then
+    elif test -n "$SSH_CONNECTION"; then
         use_256colors=1
     # We have rxvt-unicode installed, check if it supports 256 colors.
     elif installed urxvt; then
@@ -240,6 +232,11 @@ fi
 # Htop overwrites the comments in its configuration file.
 generate htoprc .in cat
 
+if installed dig; then
+    # dig doesn't support any comments in digrc.
+    grep -v -E '^#' digrc.in >digrc
+fi
+
 
 # LINK SETUP
 
@@ -257,6 +254,10 @@ link zsh/env ~/.zshenv
 link zsh/rc ~/.zshrc
 link zsh/logout ~/.zlogout
 
+if installed tmux; then
+    link terminfo ~/.terminfo
+fi
+
 # Link setup for additional files.
 if installed crontab; then
     link crontab.d ~/.crontab.d
@@ -279,3 +280,6 @@ fi
 if test -d ~/.ssh && test -O ~/.ssh; then
     link ssh_config ~/.ssh/config
 fi
+if installed dig; then
+    link digrc ~/.digrc
+fi