xinitrc: Also use feh to set background if available.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 25f46843905f0823c507c4500f3dd9364eb5d296..5aaceac4c944a1e93833131993e339e41e9e1bf3 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -14,12 +14,14 @@ 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 and UXTerm are supported.
+    # 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//;
@@ -32,9 +34,13 @@ 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
 fi
+
+if installed xpdf; then
+    link xpdfrc ~/.xpdfrc
+fi