setup.sh: Load xinitrc with lightdm.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 2dc16935fca9588f90882fd30139316d6cb49800..0e456ac34a90cf38e74972ccd4d311c38973df45 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../lib.sh
 
 if installed stumpwm; then
@@ -49,10 +51,15 @@ if installed X; then
     sed 's/^#/!/' Xdefaults > Xdefaults.tmp
     mv Xdefaults.tmp Xdefaults
 
-    if [ x`os` != xdarwin ]; then
+    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
     fi
-    if [ -f xinitrc.local ]; then
+    if test -f xinitrc.local; then
         link xinitrc.local ~/.xinitrc.local
     fi
     link xmodmaprc ~/.xmodmaprc
@@ -71,4 +78,7 @@ fi
 if installed feh; then
     mkdir -p ~/.config
     link feh ~/.config/feh
+    # Older feh versions only support theme options and configure them through
+    # ~/.fehrc.
+    link feh/themes ~/.fehrc
 fi