X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=eb7e8c2c6fe82be31e51f5afed3a3d338be166ee;hb=b8aeb26b122396eb294e39daba2ed7bad6cc33b8;hp=368fa0b7b07b4a1e0ea1559fa7704f966a762af1;hpb=6075dcef09a8871939dafbc29476bef2ed28c7a1;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 368fa0b..eb7e8c2 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
 
@@ -52,11 +52,11 @@ if installed X; then
          }'
     # Xresources uses ! as comment instead of #.
     sed_i 's/^#/!/' Xresources
-    # Use urxvt's pseudo-transparency if compton is not available. Better than
-    # nothing.
-    if ! installed compton; then
+    # Use urxvt's pseudo-transparency if neither compton nor xcompmgr are
+    # 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