From 8d5d1d018397d34c9ae41a455ae7b265dc20ec7a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 29 Jan 2018 16:27:23 -0500 Subject: I'm a dummy; I mixed up holo's resource dir and libdir --- .gitignore | 4 ++++ drain | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 30be33f..15dab7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ .tmp.* .var.* +/pristine-etc-keeper-*/ +/pristine-etc-keeper-*.tar +/pristine-etc-keeper-*.tar.* + /gitfiles.mk diff --git a/drain b/drain index e35ccd7..8f97d2d 100755 --- a/drain +++ b/drain @@ -77,9 +77,10 @@ commit() ( if type systemd-sysusers &>/dev/null; then systemd-sysusers --root=. fi - if type holo &>/dev/null && test -d /usr/lib/holo/files; then - mkdir -p -- run usr/lib/holo - ln -sT /usr/lib/holo/files usr/lib/holo/files + if type holo &>/dev/null; then + plugins=($(cat etc/holorc etc/holorc.d/* 2>/dev/null|sed -rn 's,^plugin ([a-z0-9][a-z0-9-]*)(=.*)?$,\1,p')) + mkdir -p -- run usr/lib "${plugins[@]/#/usr/share/holo/}" + ln -sT /usr/lib/holo usr/lib/holo if [ -f /etc/os-release ]; then ln -sT /etc/os-release usr/lib/os-release else -- cgit v1.2.2