X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=7ace8e0d20ab164b95be773f1bf567566454d90a;hb=462f355f79fa930d54a4dbe6a45efca894bb32bb;hp=bb7f192b054b4f2c44dc2574c11a27505e1c333f;hpb=285b4c7bf5bfa9fef167303865ac9fb58254a594;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index bb7f192..7ace8e0 100755
--- a/setup.sh
+++ b/setup.sh
@@ -5,12 +5,22 @@
 
 . ../lib.sh
 
-# Link setup.
 if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
+
 if installed X; then
-    link xinitrc ~/.xinitrc
+    # 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 #. tmp file necessary because of
+    # different implementations of `sed -i`.
+    sed 's/^#/!/' Xdefaults > Xdefaults.tmp
+    mv Xdefaults.tmp Xdefaults
+
+    if [ `os` != darwin ]; then
+        link xinitrc ~/.xinitrc
+    fi
     link xmodmaprc ~/.xmodmaprc
     link Xdefaults ~/.Xdefaults
 fi