aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2021-06-25 16:42:47 +0200
committerMattias Andrée <maandree@kth.se>2021-06-25 16:42:47 +0200
commitfb0db5d269ff178322dc23ae6c18049f3f8b9772 (patch)
tree0d716908ea2b33adb4853491e3c5d8a3d9cb6f6b
parentm (diff)
downloaddotfiles-fb0db5d269ff178322dc23ae6c18049f3f8b9772.tar.gz
dotfiles-fb0db5d269ff178322dc23ae6c18049f3f8b9772.tar.bz2
dotfiles-fb0db5d269ff178322dc23ae6c18049f3f8b9772.tar.xz
Let main Makefile select package manager
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
-rw-r--r--Makefile10
-rw-r--r--asroot/Makefile1
-rw-r--r--atril/Makefile1
-rw-r--r--audacity/Makefile1
-rw-r--r--base/Makefile1
-rw-r--r--bash-completion/Makefile1
-rw-r--r--bash/Makefile7
-rw-r--r--bus/Makefile1
-rw-r--r--claws-mail/Makefile1
-rw-r--r--common.mk1
-rw-r--r--coreutils/Makefile1
-rw-r--r--cvs/Makefile1
-rw-r--r--dconf/Makefile1
-rw-r--r--element-desktop/Makefile7
-rw-r--r--emacs/Makefile5
-rw-r--r--featherweight/Makefile1
-rw-r--r--ffmpeg/Makefile1
-rw-r--r--filesystem/Makefile1
-rw-r--r--gcc/Makefile1
-rw-r--r--git/Makefile1
-rw-r--r--gnupg/Makefile1
-rw-r--r--google-chrome/Makefile1
-rw-r--r--gpm/Makefile1
-rw-r--r--grep/Makefile1
-rw-r--r--gtk3/Makefile1
-rw-r--r--java-runtime/Makefile1
-rw-r--r--kdenlive/Makefile1
-rw-r--r--less/Makefile1
-rw-r--r--libcontacts/Makefile1
-rw-r--r--meld/Makefile1
-rw-r--r--moc/Makefile1
-rw-r--r--mplayer/Makefile1
-rw-r--r--my-scripts/Makefile1
-rw-r--r--openssh/Makefile1
-rw-r--r--pluma/Makefile1
-rw-r--r--pony.computer/Makefile1
-rw-r--r--ponysay/Makefile1
-rw-r--r--procps/Makefile1
-rw-r--r--pytagomacs/Makefile1
-rw-r--r--python/Makefile1
-rw-r--r--qt5-styleplugins/Makefile1
-rw-r--r--radharc/Makefile1
-rw-r--r--rotd/Makefile1
-rw-r--r--rust/Makefile1
-rw-r--r--signal-desktop/Makefile7
-rw-r--r--sudo/Makefile1
-rw-r--r--texinfo/Makefile1
-rw-r--r--texlive-bin/Makefile1
-rw-r--r--vlc/Makefile1
-rw-r--r--wget/Makefile1
-rw-r--r--wire-desktop/Makefile7
-rw-r--r--xmonad/Makefile15
-rw-r--r--xorg-twm/Makefile1
-rw-r--r--xorg-xinit/Makefile19
-rw-r--r--xorg-xrandr/Makefile3
-rw-r--r--xorg-xrdb/Makefile1
-rw-r--r--xorg-xset/Makefile1
-rw-r--r--xorg-xsetroot/Makefile1
-rw-r--r--xwallpaper/Makefile9
-rw-r--r--zathura/Makefile1
60 files changed, 101 insertions, 38 deletions
diff --git a/Makefile b/Makefile
index 36ff3a8..d8e10bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,16 @@
+.POSIX:
+
+CHECK_INSTALLED = pacman -Qq -- </dev/null >/dev/null
+
update:
@for PKG in *; do \
if test -d "$${PKG}"; then \
- if pacman -Qq -- $${PKG} </dev/null >/dev/null 2>/dev/null ; then \
+ if $(CHECK_INSTALLED) $${PKG} 2>/dev/null ; then \
printf -- '\033[1mmake -C %s install\033[m\n' "$${PKG}"; \
- make -C "$${PKG}" install; \
+ make -C "$${PKG}" CHECK_INSTALLED="$(CHECK_INSTALLED)" install; \
else\
printf -- '\033[1mmake -C %s uninstall\033[m\n' "$${PKG}"; \
- make -C "$${PKG}" uninstall; \
+ make -C "$${PKG}" CHECK_INSTALLED="$(CHECK_INSTALLED)" uninstall; \
fi; \
fi; \
done
diff --git a/asroot/Makefile b/asroot/Makefile
index 1069f68..2970579 100644
--- a/asroot/Makefile
+++ b/asroot/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/atril/Makefile b/atril/Makefile
index cab4117..e702482 100644
--- a/atril/Makefile
+++ b/atril/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/atril
diff --git a/audacity/Makefile b/audacity/Makefile
index ea262e6..473996c 100644
--- a/audacity/Makefile
+++ b/audacity/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
# Audacity heavily edits audacity.cfg so we make copy it instead of linking it
diff --git a/base/Makefile b/base/Makefile
index 8006e1f..6beaf4c 100644
--- a/base/Makefile
+++ b/base/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
FACE = penguin.png
diff --git a/bash-completion/Makefile b/bash-completion/Makefile
index 7d9fcc9..73f3b78 100644
--- a/bash-completion/Makefile
+++ b/bash-completion/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/bash/Makefile b/bash/Makefile
index e1e62ae..39dd6d3 100644
--- a/bash/Makefile
+++ b/bash/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.var/cache
@@ -27,9 +28,9 @@ install:
ln -sf -- ~/.dotfiles/bash/aliases ~/.config/bash/aliases
if test "$$(hostname | tr '[[:upper:]]' '[[:lower:]]')" = zenith; then \
test "$$(hostname)" = Zenith && \
- pacman -Qq -- asroot </dev/null >/dev/null && \
- pacman -Qq -- gnupg </dev/null >/dev/null && \
- pacman -Qq -- cryptsetup </dev/null >/dev/null && \
+ $(CHECK_INSTALLED) asroot && \
+ $(CHECK_INSTALLED) gnupg && \
+ $(CHECK_INSTALLED) cryptsetup && \
ln -sf -- ~/.dotfiles/bash/aliases-Zenith ~/.config/bash/aliases-Zenith; \
fi
diff --git a/bus/Makefile b/bus/Makefile
index e677bd6..d4e4c5f 100644
--- a/bus/Makefile
+++ b/bus/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 10
diff --git a/claws-mail/Makefile b/claws-mail/Makefile
index 200ef24..0c431e4 100644
--- a/claws-mail/Makefile
+++ b/claws-mail/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.claws-mail
diff --git a/common.mk b/common.mk
new file mode 100644
index 0000000..a990201
--- /dev/null
+++ b/common.mk
@@ -0,0 +1 @@
+CHECK_INSTALLED = false
diff --git a/coreutils/Makefile b/coreutils/Makefile
index 9058e3e..d061ad6 100644
--- a/coreutils/Makefile
+++ b/coreutils/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/cvs/Makefile b/cvs/Makefile
index c834e59..3ca0b4b 100644
--- a/cvs/Makefile
+++ b/cvs/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/profile.d
diff --git a/dconf/Makefile b/dconf/Makefile
index 0b1b6a1..41b756a 100644
--- a/dconf/Makefile
+++ b/dconf/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 10
diff --git a/element-desktop/Makefile b/element-desktop/Makefile
index 60aeb57..6426e83 100644
--- a/element-desktop/Makefile
+++ b/element-desktop/Makefile
@@ -1,13 +1,14 @@
.POSIX:
+include ../common.mk
install:
test -f ~/.var/element/ElementCrypt.img
test -f ~/.var/element/ElementCrypt.key
mkdir -p -- ~/.var/element/ElementCrypt.d
test -e ~/.config/Element || ln -s -- ../.var/element/ElementCrypt.d/Element ~/.config/Element
- pacman -Qq -- asroot </dev/null >/dev/null
- pacman -Qq -- gnupg </dev/null >/dev/null
- pacman -Qq -- cryptsetup </dev/null >/dev/null
+ $(CHECK_INSTALLED) asroot
+ $(CHECK_INSTALLED) gnupg
+ $(CHECK_INSTALLED) cryptsetup
mkdir -p -- ~/.config/bash/aliases.d
test ! -d ~/.config/bash/aliases.d/element-desktop
ln -sf -- ~/.dotfiles/element-desktop/bash-aliases ~/.config/bash/aliases.d/element-desktop
diff --git a/emacs/Makefile b/emacs/Makefile
index 3f8425e..beebde0 100644
--- a/emacs/Makefile
+++ b/emacs/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config
@@ -11,11 +12,11 @@ install:
ln -sf -- .config/emacs ~/.emacs.d
printf '; %s\n\n' 'This file is generated by ~/.dotfiles/emacs/Makefile' > ~/.config/emacs/init.el
cat -- init.el >> ~/.config/emacs/init.el
- if pacman -Qq -- emacs-go-mode </dev/null >/dev/null 2>/dev/null; then\
+ if $(CHECK_INSTALLED) emacs-go-mode 2>/dev/null; then\
printf '\n' >> ~/.config/emacs/init.el && \
cat -- init-go-mode.el >> ~/.config/emacs/init.el; \
fi
- if pacman -Qq -- emacs-haskell-mode </dev/null >/dev/null 2>/dev/null; then\
+ if $(CHECK_INSTALLED) emacs-haskell-mode 2>/dev/null; then\
printf '\n' >> ~/.config/emacs/init.el && \
cat -- init-haskell-mode.el >> ~/.config/emacs/init.el; \
fi
diff --git a/featherweight/Makefile b/featherweight/Makefile
index cc4f9db..4853556 100644
--- a/featherweight/Makefile
+++ b/featherweight/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/ffmpeg/Makefile b/ffmpeg/Makefile
index 32991b3..4a4fa53 100644
--- a/ffmpeg/Makefile
+++ b/ffmpeg/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/filesystem/Makefile b/filesystem/Makefile
index c6b7fde..bc3fd71 100644
--- a/filesystem/Makefile
+++ b/filesystem/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
HIDE =\
Templates\
diff --git a/gcc/Makefile b/gcc/Makefile
index ce541b9..2bd3e49 100644
--- a/gcc/Makefile
+++ b/gcc/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/profile.d
diff --git a/git/Makefile b/git/Makefile
index a428302..253a708 100644
--- a/git/Makefile
+++ b/git/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/gnupg/Makefile b/gnupg/Makefile
index ac5408f..f89880c 100644
--- a/gnupg/Makefile
+++ b/gnupg/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.var/lib/gnupg
diff --git a/google-chrome/Makefile b/google-chrome/Makefile
index 88142fa..06af0f6 100644
--- a/google-chrome/Makefile
+++ b/google-chrome/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
@:
diff --git a/gpm/Makefile b/gpm/Makefile
index 7e3b16f..da383c9 100644
--- a/gpm/Makefile
+++ b/gpm/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/grep/Makefile b/grep/Makefile
index 6c0d4e8..e3299e4 100644
--- a/grep/Makefile
+++ b/grep/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/gtk3/Makefile b/gtk3/Makefile
index 750394e..ca0e21b 100644
--- a/gtk3/Makefile
+++ b/gtk3/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/profile.d
diff --git a/java-runtime/Makefile b/java-runtime/Makefile
index 9d4947b..8376e5e 100644
--- a/java-runtime/Makefile
+++ b/java-runtime/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.var/cache/java
diff --git a/kdenlive/Makefile b/kdenlive/Makefile
index d482e64..2278478 100644
--- a/kdenlive/Makefile
+++ b/kdenlive/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
@:
diff --git a/less/Makefile b/less/Makefile
index 73b43c7..fdfe12c 100644
--- a/less/Makefile
+++ b/less/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/profile.d
diff --git a/libcontacts/Makefile b/libcontacts/Makefile
index 774bc8c..f73de4d 100644
--- a/libcontacts/Makefile
+++ b/libcontacts/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
test -d contacts
diff --git a/meld/Makefile b/meld/Makefile
index bda9978..de0373a 100644
--- a/meld/Makefile
+++ b/meld/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
# Unfortunely meldrc.ini contains both (for us unless) state and settings,
# therefore we are making a copy instead of a link. Otherwise running meld
diff --git a/moc/Makefile b/moc/Makefile
index 0d4ee14..70d4be6 100644
--- a/moc/Makefile
+++ b/moc/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.var/lib/moc
diff --git a/mplayer/Makefile b/mplayer/Makefile
index 57e4ff8..c561294 100644
--- a/mplayer/Makefile
+++ b/mplayer/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/profile.d
diff --git a/my-scripts/Makefile b/my-scripts/Makefile
index 23d998a..7c4d908 100644
--- a/my-scripts/Makefile
+++ b/my-scripts/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/openssh/Makefile b/openssh/Makefile
index 41a8d84..ed19c6f 100644
--- a/openssh/Makefile
+++ b/openssh/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/pluma/Makefile b/pluma/Makefile
index 0971cfd..1143d45 100644
--- a/pluma/Makefile
+++ b/pluma/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
@:
diff --git a/pony.computer/Makefile b/pony.computer/Makefile
index 4aa7464..f1bb603 100644
--- a/pony.computer/Makefile
+++ b/pony.computer/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/ponysay/Makefile b/ponysay/Makefile
index 7b90bd9..42cff78 100644
--- a/ponysay/Makefile
+++ b/ponysay/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/procps/Makefile b/procps/Makefile
index d7b150c..7e245e2 100644
--- a/procps/Makefile
+++ b/procps/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
-rmdir -- ~/.config/procps
diff --git a/pytagomacs/Makefile b/pytagomacs/Makefile
index 139cef6..925c591 100644
--- a/pytagomacs/Makefile
+++ b/pytagomacs/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config
diff --git a/python/Makefile b/python/Makefile
index 8c2d730..400a366 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.var/cache
diff --git a/qt5-styleplugins/Makefile b/qt5-styleplugins/Makefile
index 3f0c44f..0583e96 100644
--- a/qt5-styleplugins/Makefile
+++ b/qt5-styleplugins/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/profile.d
diff --git a/radharc/Makefile b/radharc/Makefile
index f5f2c66..0a7a4ab 100644
--- a/radharc/Makefile
+++ b/radharc/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 20
diff --git a/rotd/Makefile b/rotd/Makefile
index d95f3f0..db96d92 100644
--- a/rotd/Makefile
+++ b/rotd/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
test -d config
diff --git a/rust/Makefile b/rust/Makefile
index d58e207..cc81345 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
if test -d ~/.cargo; then \
diff --git a/signal-desktop/Makefile b/signal-desktop/Makefile
index 9dd157d..c0da6aa 100644
--- a/signal-desktop/Makefile
+++ b/signal-desktop/Makefile
@@ -1,13 +1,14 @@
.POSIX:
+include ../common.mk
install:
test -f ~/.var/signal/SignalCrypt.img
test -f ~/.var/signal/SignalCrypt.key
mkdir -p -- ~/.var/signal/SignalCrypt.d
test -e ~/.config/Signal || ln -s -- ../.var/signal/SignalCrypt.d/Signal ~/.config/Signal
- pacman -Qq -- asroot </dev/null >/dev/null
- pacman -Qq -- gnupg </dev/null >/dev/null
- pacman -Qq -- cryptsetup </dev/null >/dev/null
+ $(CHECK_INSTALLED) asroot
+ $(CHECK_INSTALLED) gnupg
+ $(CHECK_INSTALLED) cryptsetup
mkdir -p -- ~/.config/bash/aliases.d
test ! -d ~/.config/bash/aliases.d/signal-desktop
ln -sf -- ~/.dotfiles/signal-desktop/bash-aliases ~/.config/bash/aliases.d/signal-desktop
diff --git a/sudo/Makefile b/sudo/Makefile
index 479092b..6a510bf 100644
--- a/sudo/Makefile
+++ b/sudo/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config/bash/aliases.d
diff --git a/texinfo/Makefile b/texinfo/Makefile
index 0cc5a60..4bd8ed1 100644
--- a/texinfo/Makefile
+++ b/texinfo/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
if test -x /usr/bin/info; then \
diff --git a/texlive-bin/Makefile b/texlive-bin/Makefile
index 4b21f55..e3ba852 100644
--- a/texlive-bin/Makefile
+++ b/texlive-bin/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
if test -d ~/.texlive; then \
diff --git a/vlc/Makefile b/vlc/Makefile
index 1438ec6..b411fbc 100644
--- a/vlc/Makefile
+++ b/vlc/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
@:
diff --git a/wget/Makefile b/wget/Makefile
index 35c640f..92361f0 100644
--- a/wget/Makefile
+++ b/wget/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
test ! -d ~/.wget-hsts
diff --git a/wire-desktop/Makefile b/wire-desktop/Makefile
index ee40a34..e6d821b 100644
--- a/wire-desktop/Makefile
+++ b/wire-desktop/Makefile
@@ -1,13 +1,14 @@
.POSIX:
+include ../common.mk
install:
test -f ~/.var/wire/WireCrypt.img
test -f ~/.var/wire/WireCrypt.key
mkdir -p -- ~/.var/wire/WireCrypt.d
test -e ~/.config/Wire || ln -s -- ../.var/wire/WireCrypt.d/Wire ~/.config/Wire
- pacman -Qq -- asroot </dev/null >/dev/null
- pacman -Qq -- gnupg </dev/null >/dev/null
- pacman -Qq -- cryptsetup </dev/null >/dev/null
+ $(CHECK_INSTALLED) asroot
+ $(CHECK_INSTALLED) gnupg
+ $(CHECK_INSTALLED) cryptsetup
mkdir -p -- ~/.config/bash/aliases.d
test ! -d ~/.config/bash/aliases.d/wire-desktop
ln -sf -- ~/.dotfiles/wire-desktop/bash-aliases ~/.config/bash/aliases.d/wire-desktop
diff --git a/xmonad/Makefile b/xmonad/Makefile
index 35ddcd0..4003b95 100644
--- a/xmonad/Makefile
+++ b/xmonad/Makefile
@@ -1,18 +1,19 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 80
install:
- pacman -Qq -- xwallpaper </dev/null >/dev/null
- pacman -Qq -- xcman </dev/null >/dev/null
- pacman -Qq -- pdeath </dev/null >/dev/null
- pacman -Qq -- mate-panel </dev/null >/dev/null
- -pacman -Qq -- mate-settings-daemon </dev/null >/dev/null
+ $(CHECK_INSTALLED) xwallpaper
+ $(CHECK_INSTALLED) xcman
+ $(CHECK_INSTALLED) pdeath
+ $(CHECK_INSTALLED) mate-panel
+ -$(CHECK_INSTALLED) mate-settings-daemon
mkdir -p -- ~/.config/X11/xinit/xinitrc.d
test ! -d ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xmonad
ln -sf -- ~/.dotfiles/xmonad/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xmonad
- pacman -Qq -- general-preprocessor </dev/null >/dev/null
- pacman -Qq -- xpybar </dev/null >/dev/null
+ $(CHECK_INSTALLED) general-preprocessor
+ $(CHECK_INSTALLED) xpybar
mkdir -p -- ~/.xmonad
test ! -d ~/.xmonad/xmonad.hs
ln -sf -- ~/.dotfiles/xmonad/xmonad.hs ~/.xmonad/xmonad.hs
diff --git a/xorg-twm/Makefile b/xorg-twm/Makefile
index 8935a6f..77baed4 100644
--- a/xorg-twm/Makefile
+++ b/xorg-twm/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
mkdir -p -- ~/.config
diff --git a/xorg-xinit/Makefile b/xorg-xinit/Makefile
index 1c37d2f..0d017d6 100644
--- a/xorg-xinit/Makefile
+++ b/xorg-xinit/Makefile
@@ -1,19 +1,20 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 50
# Testing that xmonad is installed because it is the default sessions
# Testing that asroot, xorg-setxkbmap, and xorg-xmodmap are installed because setkeys uses them
install:
- pacman -Qq -- asroot </dev/null >/dev/null
- pacman -Qq -- dconf </dev/null >/dev/null
- pacman -Qq -- xmonad </dev/null >/dev/null
- pacman -Qq -- xorg-setxkbmap </dev/null >/dev/null
- pacman -Qq -- xorg-xmodmap </dev/null >/dev/null
- pacman -Qq -- xorg-xrandr </dev/null >/dev/null
- pacman -Qq -- xorg-xrdb </dev/null >/dev/null
- pacman -Qq -- xorg-xset </dev/null >/dev/null
- pacman -Qq -- xorg-xsetroot </dev/null >/dev/null
+ $(CHECK_INSTALLED) asroot
+ $(CHECK_INSTALLED) dconf
+ $(CHECK_INSTALLED) xmonad
+ $(CHECK_INSTALLED) xorg-setxkbmap
+ $(CHECK_INSTALLED) xorg-xmodmap
+ $(CHECK_INSTALLED) xorg-xrandr
+ $(CHECK_INSTALLED) xorg-xrdb
+ $(CHECK_INSTALLED) xorg-xset
+ $(CHECK_INSTALLED) xorg-xsetroot
mkdir -p -- ~/.config/bash/aliases.d
test ! -d ~/.config/bash/aliases.d/xorg-xinit
ln -sf -- ~/.dotfiles/xorg-xinit/bash-aliases ~/.config/bash/aliases.d/xorg-xinit
diff --git a/xorg-xrandr/Makefile b/xorg-xrandr/Makefile
index 6eed73b..b35df78 100644
--- a/xorg-xrandr/Makefile
+++ b/xorg-xrandr/Makefile
@@ -1,10 +1,11 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 15
# Testing that xwallpaper is installed because setres calls it
install:
- pacman -Qq -- xwallpaper </dev/null >/dev/null
+ $(CHECK_INSTALLED) xwallpaper
mkdir -p -- ~/.config/X11/xinit/xinitrc.d
test ! -d ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xrandr
ln -sf -- ~/.dotfiles/xorg-xrandr/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xrandr
diff --git a/xorg-xrdb/Makefile b/xorg-xrdb/Makefile
index 7dce6db..baae09f 100644
--- a/xorg-xrdb/Makefile
+++ b/xorg-xrdb/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 20
diff --git a/xorg-xset/Makefile b/xorg-xset/Makefile
index 18a23be..4d38941 100644
--- a/xorg-xset/Makefile
+++ b/xorg-xset/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 20
diff --git a/xorg-xsetroot/Makefile b/xorg-xsetroot/Makefile
index 05648e8..a827b9f 100644
--- a/xorg-xsetroot/Makefile
+++ b/xorg-xsetroot/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 20
diff --git a/xwallpaper/Makefile b/xwallpaper/Makefile
index 1d7f330..739ab7c 100644
--- a/xwallpaper/Makefile
+++ b/xwallpaper/Makefile
@@ -1,12 +1,13 @@
.POSIX:
+include ../common.mk
XINITRC_ORDER = 20
install:
- pacman -Qq -- xcman </dev/null >/dev/null
- pacman -Qq -- pdeath </dev/null >/dev/null
- pacman -Qq -- mate-panel </dev/null >/dev/null
- -pacman -Qq -- mate-settings-daemon </dev/null >/dev/null
+ $(CHECK_INSTALLED) xcman
+ $(CHECK_INSTALLED) pdeath
+ $(CHECK_INSTALLED) mate-panel
+ -$(CHECK_INSTALLED) mate-settings-daemon
mkdir -p -- ~/.config/X11/xinit/xinitrc.d
test ! -d ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xwallpaper
ln -sf -- ~/.dotfiles/xwallpaper/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xwallpaper
diff --git a/zathura/Makefile b/zathura/Makefile
index cd99a66..761bb6b 100644
--- a/zathura/Makefile
+++ b/zathura/Makefile
@@ -1,4 +1,5 @@
.POSIX:
+include ../common.mk
install:
-rmdir -- ~/.config/zathura