X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=a16faf5a8520654a019d32f0ad1102a68b67b190;hb=d55c9050f16c900a341dfdbab03de24b84b6f5be;hp=6f35e221feff17abaedd358ed1c29372f9f81c48;hpb=1cd38c8dac0b5a26375788bb7ffe5e7a18945fa2;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 6f35e22..a16faf5 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
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 . ../lib.sh
 
@@ -56,17 +56,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