setup.sh: Use new generate() argument order.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 0e456ac34a90cf38e74972ccd4d311c38973df45..df9b80e4c31fbbccbe297aa5cd47629f6b170fb0 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -22,6 +22,7 @@ set -e
 
 . ../lib.sh
 
+
 if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
@@ -33,7 +34,7 @@ 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 +47,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