setup.sh: Add and use grep_i() - in-place grep.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index d96f5df14cdc1e323a88194531e82997ec20509a..370bf5c0f7006a708ddf7fe1dce564b2d0fd54cd 100755 (executable)
--- 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
@@ -66,8 +70,8 @@ chmod 0600 ~/.less
 
 # Custom colors for GNU ls.
 if installed dircolors; then
-    echo '# WARNING! DO NOT EDIT THIS FILE!' > shell/dircolors
-    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
@@ -75,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=
@@ -169,16 +173,14 @@ fi
 # "(ROOT)".
 if test "`id -u`" -ne 0; then
     echo screenrc: removing root options
-    grep -v '(ROOT)' screenrc > screenrc.tmp
-    mv screenrc.tmp screenrc
+    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
+    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.
@@ -190,8 +192,7 @@ fi
 # 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
+    grep_i -v '(BATTERY)' screenrc
 fi
 
 if installed tmux; then
@@ -199,10 +200,10 @@ if installed tmux; then
 
     # 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 >tmux.conf.tmp \
         -e 'while (<STDIN>) {
                 s/\bTMUX_WINDOW_PATH\b/$ARGV[0]/;
                 print;