X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=bb2e4c0dbe1865a93463d9fb3fc12280ac71f162;hb=30eeed26f1b9f679cf9510e5af03a9e64ddf0158;hp=7bf78826e42a54e08619b74022e0dc8053010599;hpb=9d22fdb6ba21eb87266fac19f252e548dda78d7a;p=config%2Fdotfiles.git diff --git a/setup.sh b/setup.sh index 7bf7882..bb2e4c0 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,11 @@ terminal_info() { terminal_available() { terminal_info "$@" > /dev/null } +grep_i() { + cmd_i grep "$@" +} # 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,7 +58,7 @@ 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 +echo 'lesskey: generating .lesskey' perl < lesskey \ -e 'while () { s/\bHISTORY_PATH\b/$ARGV[0]/; @@ -66,7 +70,8 @@ chmod 0600 ~/.less # Custom colors for GNU ls. if installed dircolors; then - dircolors -b shell/dircolors.in > 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 @@ -74,10 +79,10 @@ fi # speeds up shell starts. # # Check if colors are available. -if ls --color > /dev/null 2>&1; then +if ls --color >/dev/null 2>&1; then ls_color=gnu else - if ls -G > /dev/null 2>&1; then + if ls -G >/dev/null 2>&1; then ls_color=cli else ls_color= @@ -106,7 +111,7 @@ else column= fi -generate perl shell/aliases \ +generate shell/aliases .in perl \ -e 'while () { s/\bLS_ENV\b/$ARGV[0]/; s/\bLS_PATH\b/$ARGV[1]/; @@ -126,11 +131,10 @@ 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. @@ -161,50 +165,45 @@ 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 + echo 'screenrc: removing battery display' + grep_i -v '(BATTERY)' screenrc fi if installed tmux; then - generate perl tmux.conf ./bin/remove-continuation.pl + generate tmux.conf .in perl ./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 \ + perl tmux.conf.tmp \ -e 'while () { s/\bTMUX_WINDOW_PATH\b/$ARGV[0]/; print; @@ -214,21 +213,19 @@ if installed tmux; then # 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 # LINK SETUP @@ -266,6 +263,6 @@ if installed htop; then mkdir -p ~/.config/htop link htoprc ~/.config/htop/htoprc fi -if test -d ~/.ssh; then +if test -d ~/.ssh && test -O ~/.ssh; then link ssh_config ~/.ssh/config fi