xmonad.hs: Move to new xmonad/ directory.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 2a9185517fe253f51607e5107e1aea057b6c4bf0..961e465cc35e95a9b8994b125ff5763e62489677 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -9,7 +9,7 @@ if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
 if installed xmonad; then
-    link . ~/.xmonad
+    link xmonad ~/.xmonad
 fi
 
 if installed X; then
@@ -34,9 +34,14 @@ if installed X; then
     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