summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-01-29 16:27:23 -0500
committerLuke Shumaker <lukeshu@lukeshu.com>2018-01-29 16:27:35 -0500
commit8d5d1d018397d34c9ae41a455ae7b265dc20ec7a (patch)
tree8eb37f2ea95b5ac694ea4ae65334ee10fd1131ca
parent5b4b1d29f7352d97fb022d21dbecb56f7eca5cbf (diff)
I'm a dummy; I mixed up holo's resource dir and libdir
-rw-r--r--.gitignore4
-rwxr-xr-xdrain7
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