X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=b6bd30e5df9e307e0bc2669d0d7e3ba1324b2039;hb=92fb2c039fb3510301e34ada4a13fcb8af34974e;hp=c5406e6b6ce06b5d02c376b12495e9602d1ae447;hpb=020f30113df431a611f9a6ec9d963f1da38bb8ec;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index c5406e6..b6bd30e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -30,7 +30,7 @@ terminal_available() {
     terminal_info "$@" > /dev/null
 }
 # 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,7 +66,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 +75,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=
@@ -126,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
@@ -162,15 +162,14 @@ 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)".
 if test "`id -u`" -ne 0; then
     echo screenrc: removing root options
-    grep -v '(ROOT)' screenrc > screenrc.tmp
+    grep -v '(ROOT)' screenrc >screenrc.tmp
     mv screenrc.tmp screenrc
 fi
 # I use some features of GNU screen which are only in Git or very recent GNU
@@ -178,21 +177,20 @@ fi
 # marked as "(GIT)".
 if test ! -d "$HOME/development/shell/screen"; then
     echo screenrc: removing Git features
-    grep -v '(GIT)' screenrc > screenrc.tmp
+    grep -v '(GIT)' screenrc >screenrc.tmp
     mv screenrc.tmp 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
+    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
+    grep -v '(BATTERY)' screenrc >screenrc.tmp
     mv screenrc.tmp screenrc
 fi
 
@@ -201,10 +199,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;
@@ -215,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
 
@@ -266,4 +262,6 @@ if installed htop; then
     mkdir -p ~/.config/htop
     link htoprc ~/.config/htop/htoprc
 fi
-
+if test -d ~/.ssh && test -O ~/.ssh; then
+    link ssh_config ~/.ssh/config
+fi