X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=7ace8e0d20ab164b95be773f1bf567566454d90a;hb=462f355f79fa930d54a4dbe6a45efca894bb32bb;hp=9e161bde0d519ac5cf614a52de902444cb67d144;hpb=cb02687091d8be1eeed80e4ffd57f0a0c737fdf1;p=config%2Fdotfiles.git diff --git a/setup.sh b/setup.sh index 9e161bd..7ace8e0 100755 --- a/setup.sh +++ b/setup.sh @@ -13,10 +13,14 @@ if installed X; then # Use settings for XTerm also for UXTerm. This prevents code duplication. generate awk Xdefaults \ '{ print ; if ( /^XTerm/ ) { print "U" $0 } }' - # Xdefaults uses ! as comment instead of #. - sed -i 's/^#/!/' Xdefaults + # Xdefaults uses ! as comment instead of #. tmp file necessary because of + # different implementations of `sed -i`. + sed 's/^#/!/' Xdefaults > Xdefaults.tmp + mv Xdefaults.tmp Xdefaults - link xinitrc ~/.xinitrc + if [ `os` != darwin ]; then + link xinitrc ~/.xinitrc + fi link xmodmaprc ~/.xmodmaprc link Xdefaults ~/.Xdefaults fi