X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=cce1d19a0d0dfd35b764db8bea97de421c899678;hb=de57a54e54230179017cdea80b8bed47c6042ce6;hp=1feb7ad68dad1fe19aa7a8dfe408f5e125396ac4;hpb=7581f733804cc654ee077a21b5d18a8fd2212685;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 1feb7ad..cce1d19 100755
--- a/setup.sh
+++ b/setup.sh
@@ -13,17 +13,35 @@ if installed xmonad; then
 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 } }'
+    # 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
 
-    if [ `os` != darwin ]; then
+    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