X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=0f84352570592dc3cbaea1b64d12d4dc4ad5be0e;hb=88ba0f56e16573a402d6fcbb383dc0f62fc4620d;hp=6a26b0486cc2d865355c9d1c21e78d14e8050af8;hpb=e4417dd84069be88e22e300d15dfda22875a4cff;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 6a26b04..0f84352 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,7 +2,7 @@
 
 # Setup script for X11 configuration files.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,14 +35,13 @@ 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.
+    # are for XTerm and UXTerm.
     generate Xresources .in perl -ne \
         'if (/^Term/) {
              s/^Term//;
              print "XTerm", $_;
              print "UXTerm", $_;
-             print "Rxvt", $_;
+             print "URxvt", $_;
          } elsif (/^XTerm/) {
              print $_;
              s/^XTerm//;
@@ -56,17 +55,15 @@ if installed X; then
     # available. Better than nothing.
     if ! installed compton && ! installed xcompmgr; then
         echo 'Xresources: no compton found, enabling pseudo-transparency'
-        sed_i 's/^Rxvt\*background/!&/' Xresources
+        sed_i 's/^Rxvt\*background: \[/!&/' Xresources
         sed_i 's/^!NO_COMPTON //' Xresources
     fi
 
     if test ! "x`os`" = xdarwin; then
         link xinitrc ~/.xinitrc
-        # lightdm doesn't use ~/.xinitrc but ~/.xprofile instead. Assume it's
-        # used when the lightdm configuration file is present.
-        if test -f "$HOME/.dmrc"; then
-            link xinitrc ~/.xprofile
-        fi
+        # Most display managers use ~/.xsession instead of ~/.xinitrc (which
+        # is used by e.g. startx). Provide both links.
+        link xinitrc ~/.xsession
     fi
     if test -f xinitrc.local; then
         link xinitrc.local ~/.xinitrc.local
@@ -74,6 +71,10 @@ if installed X; then
     link xmodmaprc ~/.xmodmaprc
     link Xresources ~/.Xresources
     link XCompose ~/.XCompose
+
+    link fonts ~/.fonts
+
+    link bin/xlockscreen ~/.xlockscreen
 fi
 
 if installed xpdf; then