aboutsummaryrefslogtreecommitdiffstats
path: root/xorg-xset
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 /xorg-xset
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 '')
-rw-r--r--xorg-xset/Makefile9
-rw-r--r--xorg-xsetroot/Makefile9
2 files changed, 10 insertions, 8 deletions
diff --git a/xorg-xset/Makefile b/xorg-xset/Makefile
index 4d38941..a029f8d 100644
--- a/xorg-xset/Makefile
+++ b/xorg-xset/Makefile
@@ -1,17 +1,18 @@
.POSIX:
-include ../common.mk
XINITRC_ORDER = 20
install:
mkdir -p -- ~/.config/X11/xinit/xinitrc.d
- test ! -d ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xset
+ test ! -e ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xset || \
+ test -L ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xset
ln -sf -- ~/.dotfiles/xorg-xset/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xset
uninstall:
+ +! ../check-installed xorg-xset
+ +! ../check-installed xset
+ +! ../check-installed x11-xserver-utils
-unlink -- ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xset
-rmdir -- ~/.config/X11/xinit/xinitrc.d
-rmdir -- ~/.config/X11/xinit
-rmdir -- ~/.config/X11
-
-.PHONY: install uninstall
diff --git a/xorg-xsetroot/Makefile b/xorg-xsetroot/Makefile
index d58490d..a3b57d9 100644
--- a/xorg-xsetroot/Makefile
+++ b/xorg-xsetroot/Makefile
@@ -1,17 +1,18 @@
.POSIX:
-include ../common.mk
XINITRC_ORDER = 85
install:
mkdir -p -- ~/.config/X11/xinit/xinitrc.d
- test ! -d ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xsetroot
+ test ! -e ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xsetroot || \
+ test -L ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xsetroot
ln -sf -- ~/.dotfiles/xorg-xsetroot/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xsetroot
uninstall:
+ +! ../check-installed xorg-xsetroot
+ +! ../check-installed xsetroot
+ +! ../check-installed x11-xserver-utils
-unlink -- ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xsetroot
-rmdir -- ~/.config/X11/xinit/xinitrc.d
-rmdir -- ~/.config/X11/xinit
-rmdir -- ~/.config/X11
-
-.PHONY: install uninstall