X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=setup.sh;h=08efb21e3da725828b957307d14bc633ded08f9b;hp=b1b14de21a0c1e9830ad9bc2c92f23f39a7ccb7c;hb=b2a118a0ad79bcee7bd83925ac9df338d6087f2f;hpb=6de4a52bedfdf81e90186d9c4e100b56815ddad5 diff --git a/setup.sh b/setup.sh index b1b14de..08efb21 100755 --- a/setup.sh +++ b/setup.sh @@ -22,6 +22,7 @@ set -e . ../lib.sh + # Helper functions. terminal_info() { infocmp "$@" 2>&1 @@ -29,8 +30,19 @@ terminal_info() { terminal_available() { terminal_info "$@" > /dev/null } +# Usage: +apply_optional_replacement() { + if test -n "$4"; then + printf '%s: using %s %s\n' "$1" "$2" "$4" + generate "$1" '' simple_cpp \ + "$3" -- "$4" + else + printf '%s: removing %s display\n' "$1" "$2" + grep_i -v "$3" "$1" + fi +} # Check if `infocmp` is available. -if ! infocmp > /dev/null 2>&1; then +if ! infocmp >/dev/null 2>&1; then echo 'Warning: `infocmp` not available! 256color checks will fail.' echo fi @@ -54,43 +66,28 @@ mkdir -p zsh/cache # Generate ~/.less with lesskey. Prevent cluttering ~/ by storing the history # file in this directory; this requires replacing the constant HISTORY_PATH in # lesskey. -echo lesskey: generating .lesskey -perl < lesskey \ - -e 'while () { - s/\bHISTORY_PATH\b/$ARGV[0]/; - print; - }' \ - "`pwd`/lesshistory" \ +echo 'lesskey: generating .lesskey' +simple_cpp shell/dircolors + echo '# WARNING! DO NOT EDIT THIS FILE!' >shell/dircolors + 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. -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 +# GNU ls with colors available. +if ls --color >/dev/null 2>&1; 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. @@ -106,15 +103,9 @@ else column= fi -generate perl shell/aliases \ - -e 'while () { - 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" "$column" +generate shell/aliases .in simple_cpp \ + LS_ENV LS_COLOR COLUMN -- \ + "$ls_env" "$ls_color" "$column" # If `tig` is not available use my simple replacement. if ! installed tig; then @@ -126,19 +117,22 @@ if echo test | grep --color=auto test >/dev/null 2>&1; then : else echo 'shell/aliases: removing grep --color=auto' - sed '/^alias grep=/ s/^/#/' shell/aliases > shell/aliases.tmp - mv shell/aliases.tmp shell/aliases + sed_i '/^alias grep=/ s/^/#/' shell/aliases fi -generate cat screenrc .in +generate screenrc .in cat # As screen-256color is not widely supported use it only on machines where the # matching terminfo entry is available. This also requires a terminal emulator # 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 @@ -161,74 +155,87 @@ if terminal_available screen-256color; then fi fi if test -z "$use_256colors"; then - echo screenrc: removing 256 colors - sed 's/Enable 256 color/Disable 256 color/; - s/screen-256color/screen/' screenrc > screenrc.tmp - mv screenrc.tmp screenrc + echo 'screenrc: removing 256 colors' + sed_i 's/Enable 256 color/Disable 256 color/; + s/screen-256color/screen/' screenrc fi # Some options are only necessary when running as root. They are marked as # "(ROOT)". if test "`id -u`" -ne 0; then - echo screenrc: removing root options - grep -v '(ROOT)' screenrc > screenrc.tmp - mv screenrc.tmp screenrc + echo 'screenrc: removing root options' + grep_i -v '(ROOT)' screenrc fi # I use some features of GNU screen which are only in Git or very recent GNU # screen versions. Drop them on machines which have older versions. They are # marked as "(GIT)". if test ! -d "$HOME/development/shell/screen"; then - echo screenrc: removing Git features - grep -v '(GIT)' screenrc > screenrc.tmp - mv screenrc.tmp screenrc + echo 'screenrc: removing Git features' + grep_i -v '(GIT)' screenrc fi # Rxvt doesn't need the attrcolor "fix". As I prefer rxvt assume I use it when # it's installed. if installed rxvt; then - echo screenrc: removing attrcolor \"fix\" - sed 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc > screenrc.tmp - mv screenrc.tmp screenrc + echo 'screenrc: removing attrcolor "fix"' + sed_i 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc fi # Display current battery charge on computers with a battery. Necessary lines -# are marked as "(BATTERY)". -if test ! -d /sys/class/power_supply/BAT0; then - echo screenrc: removing battery display - grep -v '(BATTERY)' screenrc > screenrc.tmp - mv screenrc.tmp screenrc +# are marked as "(BATTERY)". Also used for Tmux. +battery= +for x in /sys/class/power_supply/BAT*; do + test -d "$x" || continue + battery="$x" +done +apply_optional_replacement screenrc \ + battery BATTERY "$battery" +# Display current temperature. Necessary lines are marked as "(TEMPERATURE)". +# Also used for Tmux. +temperature=/sys/devices/platform/coretemp.0 +if ! test -d "$temperature"; then + temperature= fi +apply_optional_replacement screenrc \ + temperature TEMPERATURE "$temperature" + if installed tmux; then - generate perl tmux.conf ./bin/remove-continuation.pl + generate tmux.conf .in cat + + apply_optional_replacement tmux.conf \ + battery BATTERY "$battery" + apply_optional_replacement tmux.conf \ + temperature TEMPERATURE "$temperature" + + # Old Tmux versions can't handle that. + generate tmux.conf '' ./bin/remove-continuation.pl # Add mappings to switch to windows 10-29 quickly. See tmux-window.pl for # details. - perl ./tmux-window.pl 1 "`pwd`/tmux-window2.conf" > tmux-window1.conf - perl ./tmux-window.pl 2 > tmux-window2.conf + perl ./tmux-window.pl 1 "`pwd`/tmux-window2.conf" >tmux-window1.conf + perl ./tmux-window.pl 2 >tmux-window2.conf # Set absolute path to tmux-window1.conf in tmux.conf. - perl < tmux.conf > tmux.conf.tmp \ - -e 'while () { - s/\bTMUX_WINDOW_PATH\b/$ARGV[0]/; - print; - }' \ - "`pwd`/tmux-window1.conf" - mv tmux.conf.tmp tmux.conf + generate tmux.conf '' simple_cpp \ + TMUX_WINDOW_PATH -- "`pwd`/tmux-window1.conf" # 256 colors not available. if test -z "$use_256colors"; then - echo tmux.conf: removing 256 colors - sed 's/Enable 256 color/Disable 256 color/; - s/screen-256color/screen/' tmux.conf > tmux.conf.tmp - mv tmux.conf.tmp tmux.conf + echo 'tmux.conf: removing 256 colors' + sed_i 's/Enable 256 color/Disable 256 color/; + s/screen-256color/screen/' tmux.conf fi # Tmux doesn't display a warning if the shell wasn't found! if test ! -x '/bin/zsh'; then - echo tmux.conf: removing /bin/zsh as shell - sed 's/zsh/sh/' tmux.conf > tmux.conf.tmp - mv tmux.conf.tmp tmux.conf + echo 'tmux.conf: removing /bin/zsh as shell' + sed_i 's/zsh/sh/' tmux.conf fi fi # Htop overwrites the comments in its configuration file. -generate cat htoprc .in +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 @@ -247,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 @@ -269,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