From 56cd40c72e07cbf7de5d70db796956b62a10ba80 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Wed, 2 Dec 2015 00:32:53 +0100 Subject: [PATCH] bee: Always find beeuniq (if not in PATH) --- hooks/mandb.sh | 2 +- src/beelib.config.sh.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hooks/mandb.sh b/hooks/mandb.sh index 5da562c..28596f5 100644 --- a/hooks/mandb.sh +++ b/hooks/mandb.sh @@ -43,7 +43,7 @@ fi : ${man_dirs:=${PKG_MANDIR}} : ${man_dirs:=${XDG_DATA_DIRS//:/\/man:}/man} -for man_dir in $(beeuniq ${man_dirs//:/ }) ; do +for man_dir in $(${BEE_BINDIR}/beeuniq ${man_dirs//:/ }) ; do case "${action}" in "post-remove"|"post-install") if grep -q "file=${man_dir}" ${content} ; then diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in index 09ad99b..1c174e4 100644 --- a/src/beelib.config.sh.in +++ b/src/beelib.config.sh.in @@ -91,8 +91,8 @@ function config_init_base_config() { XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS}:${BEE_CONFIG_DIR} # remove dupes from pathes - XDG_CONFIG_DIRS=$(beeuniq -d : ${XDG_CONFIG_DIRS//:/ }) - XDG_DATA_DIRS=$(beeuniq -d : ${XDG_DATA_DIRS//:/ }) + XDG_CONFIG_DIRS=$(${BEE_BINDIR}/beeuniq -d : ${XDG_CONFIG_DIRS//:/ }) + XDG_DATA_DIRS=$(${BEE_BINDIR}/beeuniq -d : ${XDG_DATA_DIRS//:/ }) }