From 0f1df0db903ba576fd17b08197d3066af7a61e5f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 18 Nov 2023 23:23:40 +0100 Subject: A lot of changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- dbus/Makefile | 7 +++---- dbus/xinit | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'dbus') 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 diff --git a/dbus/xinit b/dbus/xinit index 28bb1d1..e5616f8 100644 --- a/dbus/xinit +++ b/dbus/xinit @@ -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 -- cgit v1.2.3-70-g09d2