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

diff --git a/setup.sh b/setup.sh
index 9e161bd..961e465 100755
--- a/setup.sh
+++ b/setup.sh
@@ -8,15 +8,40 @@
 if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
+if installed xmonad; then
+    link xmonad ~/.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
+    # Prevent code duplication. Term* rules are for all terminals; XTerm rules
+    # are for XTerm and UXTerm. At the moment XTerm, UXTerm and Rxvt are
+    # supported.
+    generate perl Xdefaults -ne \
+        'if (/^Term/) {
+             s/^Term//;
+             print "XTerm", $_;
+             print "UXTerm", $_;
+             print "Rxvt", $_;
+         } elsif (/^XTerm/) {
+             print $_;
+             s/^XTerm//;
+             print "UXTerm", $_;
+         } else {
+             print $_;
+         }'
+    # 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 [ x`os` != xdarwin ]; then
+        link xinitrc ~/.xinitrc
+    fi
     link xmodmaprc ~/.xmodmaprc
     link Xdefaults ~/.Xdefaults
+    link XCompose ~/.XCompose
+fi
+
+if installed xpdf; then
+    link xpdfrc ~/.xpdfrc
 fi