From 75e0616f82cd0b9e057692c065ada56de2b4f321 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 8 Oct 2013 16:33:21 +0200 Subject: [PATCH] setup.sh: Use sed_i(). --- setup.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/setup.sh b/setup.sh index adc2ce6..d96f5df 100755 --- a/setup.sh +++ b/setup.sh @@ -127,8 +127,7 @@ 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 @@ -163,9 +162,8 @@ if terminal_available screen-256color; then 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 + 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)". @@ -186,8 +184,7 @@ fi # 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 + 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)". @@ -216,15 +213,13 @@ 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 + 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 + sed_i 's/zsh/sh/' tmux.conf fi fi -- 2.43.2