X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=setup.sh;h=45a469bc5ab12d8341d7b92a54e920d3ad67c6a6;hp=0e456ac34a90cf38e74972ccd4d311c38973df45;hb=27f498589e349b689b3290f90e8c291731de51f3;hpb=d85c2b9f1489acb02ac22dd0b2622b27efdb306e

diff --git a/setup.sh b/setup.sh
index 0e456ac..45a469b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -22,18 +22,22 @@ set -e
 
 . ../lib.sh
 
+
 if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
 if installed xmonad; then
     link xmonad ~/.xmonad
 fi
+if installed herbstluftwm; then
+    link herbstluftwm ~/.config/herbstluftwm
+fi
 
 if installed X; then
     # 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 \
+    generate Xdefaults .in perl -ne \
         'if (/^Term/) {
              s/^Term//;
              print "XTerm", $_;
@@ -46,10 +50,8 @@ if installed X; then
          } 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
+    # Xdefaults uses ! as comment instead of #.
+    sed_i 's/^#/!/' Xdefaults
 
     if test ! "x`os`" = xdarwin; then
         link xinitrc ~/.xinitrc