xmonad.hs: Move to new xmonad/ directory.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 1feb7ad68dad1fe19aa7a8dfe408f5e125396ac4..961e465cc35e95a9b8994b125ff5763e62489677 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -9,21 +9,39 @@ if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
 if installed xmonad; then
-    link . ~/.xmonad
+    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 } }'
+    # 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