diff options
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/Makefile | 7 | ||||
| -rw-r--r-- | dbus/xinit | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/dbus/Makefile b/dbus/Makefile index aab1396..80e240b 100644 --- a/dbus/Makefile +++ b/dbus/Makefile @@ -1,15 +1,14 @@ .POSIX: -include ../common.mk XINITRC_ORDER = 50 install: mkdir -p -- ~/.config/X11/xinit/xinitrc.d - test ! -d ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-dbus + test ! -e ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-dbus || \ + test -L ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-dbus ln -sf -- ~/.dotfiles/dbus/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-dbus uninstall: + +! ../check-installed dbus -unlink -- ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-dbus -rmdir -- ~/.config/X11/xinit/xinitrc.d - -.PHONY: install uninstall @@ -1,4 +1,8 @@ # -*- shell-script -*- +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then + eval "$(dbus-launch --sh-syntax)" +fi + # Functional alernative to /etc/X11/xinit/xinitrc.d/50-systemd-user.sh, just skips first part dbus-update-activation-environment DISPLAY XAUTHORITY |