X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=setup.sh;h=08efb21e3da725828b957307d14bc633ded08f9b;hp=14bc7a8d97fb2458c79af3bdec6223facd5dc244;hb=b2a118a0ad79bcee7bd83925ac9df338d6087f2f;hpb=d6a9655958d66b76da99d2a80807fca63b63d7b8 diff --git a/setup.sh b/setup.sh index 14bc7a8..08efb21 100755 --- a/setup.sh +++ b/setup.sh @@ -82,8 +82,6 @@ fi # shell/aliases.in for details. Doing this here instead of in shell/aliases # speeds up shell starts. # -# Absolute path to `ls`. -ls_path=`installed_path ls` # GNU ls with colors available. if ls --color >/dev/null 2>&1; then ls_env= @@ -106,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 @@ -234,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 @@ -251,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 @@ -273,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