X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=1feb7ad68dad1fe19aa7a8dfe408f5e125396ac4;hb=670c8245b07f95ac6e99da7bfc5f5eb45e8efbff;hp=9e161bde0d519ac5cf614a52de902444cb67d144;hpb=cb02687091d8be1eeed80e4ffd57f0a0c737fdf1;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 9e161bd..1feb7ad 100755
--- a/setup.sh
+++ b/setup.sh
@@ -8,15 +8,22 @@
 if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
+if installed xmonad; then
+    link . ~/.xmonad
+fi
 
 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