diff options
| author | Mattias Andrée <maandree@kth.se> | 2024-06-16 23:14:25 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2024-06-16 23:14:25 +0200 |
| commit | e0ca6ce462fd471edf017a541a160895bb762362 (patch) | |
| tree | 78ec02202ff902dffada0d598359e67e3f3dbc19 | |
| parent | do not use -- with stty; although stty(1posix) says -- shall behave as normal, it does not in the GNU implementation, and stty(1posix) specifically... (diff) | |
| parent | Merge branch 'master' of ssh://maandree.se/gitrepos/~maandree/dotfiles (diff) | |
| download | dotfiles-e0ca6ce462fd471edf017a541a160895bb762362.tar.gz dotfiles-e0ca6ce462fd471edf017a541a160895bb762362.tar.bz2 dotfiles-e0ca6ce462fd471edf017a541a160895bb762362.tar.xz | |
Merge branch 'master' of ssh://maandree.se/gitrepos/~maandree/dotfiles
| -rw-r--r-- | Makefile | 29 | ||||
| -rw-r--r-- | alsa-utils/Makefile | 2 | ||||
| -rw-r--r-- | base/xinit | 1 | ||||
| -rw-r--r-- | man/Makefile | 2 | ||||
| -rw-r--r-- | mate-settings-daemon/Makefile | 17 | ||||
| -rw-r--r-- | xorg-xsetroot/xinit | 1 |
6 files changed, 48 insertions, 4 deletions
@@ -1,13 +1,15 @@ .POSIX: -update: +update: update-common update-private update-work + +update-common: +@for PKGDIR in *; do \ if test -d "$${PKGDIR}"; then \ PKG="$$(printf '%s@\n' "$${PKGDIR}" | cut -d @ -f 1)"; \ HOST="$$(printf '%s@\n' "$${PKGDIR}" | cut -d @ -f 2 | tr A-Z a-z)"; \ if test -z "$${HOST}" || test "$${HOST}" = "$$(hostname | tr A-Z a-z)"; then \ if ./check-installed "$${PKG}" 2>/dev/null; then \ - if ! ./check-installed "$$(readlink -- "$${PKG}")" 2>/dev/null; then \ + if ! ./check-installed "$$(readlink -- "$${PKGDIR}")" 2>/dev/null; then \ printf -- '\033[1mcd %s && %s install\033[m\n' "$${PKGDIR}" '$(MAKE)'; \ (cd -- "$${PKGDIR}" && $(MAKE) install); \ fi; \ @@ -18,9 +20,32 @@ update: fi; \ fi; \ done + +update-private: +if test -f .private/pkgs/Makefile || test -f .private/pkgs/makefile; then \ cd -- .private/pkgs && $(MAKE); \ fi + +update-work: +if test -f .work/pkgs/Makefile || test -f .work/pkgs/makefile; then \ cd -- .work/pkgs && $(MAKE); \ fi + +.DEFAULT: + +@for PKGDIR in $@; do \ + if test -d "$${PKGDIR}"; then \ + PKG="$$(printf '%s@\n' "$${PKGDIR}" | cut -d @ -f 1)"; \ + HOST="$$(printf '%s@\n' "$${PKGDIR}" | cut -d @ -f 2 | tr A-Z a-z)"; \ + if test -z "$${HOST}" || test "$${HOST}" = "$$(hostname | tr A-Z a-z)"; then \ + if ./check-installed "$${PKG}" 2>/dev/null; then \ + if ! ./check-installed "$$(readlink -- "$${PKGDIR}")" 2>/dev/null; then \ + printf -- '\033[1mcd %s && %s install\033[m\n' "$${PKGDIR}" '$(MAKE)'; \ + (cd -- "$${PKGDIR}" && $(MAKE) install); \ + fi; \ + else\ + printf -- '\033[1mcd %s && %s uninstall\033[m\n' "$${PKGDIR}" '$(MAKE)'; \ + (cd -- "$${PKGDIR}" && $(MAKE) uninstall || :); \ + fi; \ + fi; \ + fi; \ + done diff --git a/alsa-utils/Makefile b/alsa-utils/Makefile index 13cc906..2a86985 100644 --- a/alsa-utils/Makefile +++ b/alsa-utils/Makefile @@ -13,7 +13,7 @@ install: mkdir -p -- ~/.config/X11/xinit/xinitrc.d test ! -e ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-alsa-util || \ test -L ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-alsa-util - ln -sf -- ~/.dotfiles/alsa-util/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-alsa-util + ln -sf -- ~/.dotfiles/alsa-utils/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-alsa-util uninstall: +! ../check-installed alsa-utils @@ -2,6 +2,7 @@ # Set keyboard settings setkeys || : +(sleep 2; setkeys || :) & # Start hotkey daemon xkbdbind & diff --git a/man/Makefile b/man/Makefile index 726047c..6fe759b 100644 --- a/man/Makefile +++ b/man/Makefile @@ -3,7 +3,7 @@ install: ../check-installed-shebang colourised-less-for-man ../check-installed-shebang man - ../check-in-path dmenu + -../check-in-path dmenu ../check-in-path sed ../check-in-path isfg ../check-in-path less diff --git a/mate-settings-daemon/Makefile b/mate-settings-daemon/Makefile new file mode 100644 index 0000000..6a335d8 --- /dev/null +++ b/mate-settings-daemon/Makefile @@ -0,0 +1,17 @@ +.POSIX: + +install: + test ! -e ~/.local/bin/mate-settings-daemon || test -L ~/.local/bin/mate-settings-daemon + if test -f /usr/libexec/mate-settings-daemon; then \ + ln -sf /usr/libexec/mate-settings-daemon ~/.local/bin/mate-settings-daemon; \ + elif test -f /usr/lib/mate-settings-daemon/mate-settings-daemon; then \ + ln -sf /usr/lib/mate-settings-daemon/mate-settings-daemon ~/.local/bin/mate-settings-daemon; \ + elif test -f /usr/lib/mate-settings-daemon; then \ + ln -sf /usr/lib/mate-settings-daemon ~/.local/bin/mate-settings-daemon; \ + else \ + rm -f -- ~/.local/bin/mate-settings-daemon 2>/dev/null; \ + fi + +uninstall: + +! ../check-installed mate-settings-daemon + -unlink -- ~/.local/bin/mate-settings-daemon diff --git a/xorg-xsetroot/xinit b/xorg-xsetroot/xinit index 27f06b1..c172260 100644 --- a/xorg-xsetroot/xinit +++ b/xorg-xsetroot/xinit @@ -2,3 +2,4 @@ # Set cursor to right handed pointer xsetroot -cursor_name left_ptr +(sleep 2; xsetroot -cursor_name left_ptr) & |