aboutsummaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2023-11-18 23:23:40 +0100
committerMattias Andrée <maandree@kth.se>2023-11-18 23:23:40 +0100
commit0f1df0db903ba576fd17b08197d3066af7a61e5f (patch)
treea59c04307b1382257afa3c3512ec3abadf7e0e47 /dbus
parentUse losetup -d instead of --detach and add clean up (diff)
downloaddotfiles-0f1df0db903ba576fd17b08197d3066af7a61e5f.tar.gz
dotfiles-0f1df0db903ba576fd17b08197d3066af7a61e5f.tar.bz2
dotfiles-0f1df0db903ba576fd17b08197d3066af7a61e5f.tar.xz
A lot of changes
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'dbus')
-rw-r--r--dbus/Makefile7
-rw-r--r--dbus/xinit4
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
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