summaryrefslogtreecommitdiffstats
path: root/scripts/libmakepkg/util
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2019-04-16 19:12:39 +0200
committerAllan McRae <allan@archlinux.org>2019-05-08 04:45:34 +0200
commit614ef781ebf8ef7ae116c26d419bc9002c162599 (patch)
tree6a5ceed5eef7d90d16e67980d24dddc7e850681d /scripts/libmakepkg/util
parentb93dfa935f900d884f14d5be8949dc0ae85f1692 (diff)
downloadpacman-614ef781ebf8ef7ae116c26d419bc9002c162599.tar.gz
pacman-614ef781ebf8ef7ae116c26d419bc9002c162599.tar.xz
libmakepkg: fix missing or inaccurate interdependencies
When the executable checking was refactored into libmakepkg, it carried with it, usage of $E_* error codes, which need to be declared from error.sh but are only available when the parent program already sources error.sh; additionally, message.sh was only loaded in a parent library, but not where it was needed, and option.sh was often loaded when it wasn't needed at all. util.sh, meanwhile, has always depended on message.sh functions. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/libmakepkg/util')
-rw-r--r--scripts/libmakepkg/util/util.sh.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in
index c2f5897e..5ea3ed9b 100644
--- a/scripts/libmakepkg/util/util.sh.in
+++ b/scripts/libmakepkg/util/util.sh.in
@@ -22,6 +22,9 @@
[[ -n "$LIBMAKEPKG_UTIL_UTIL_SH" ]] && return
LIBMAKEPKG_UTIL_UTIL_SH=1
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
##
# usage : in_array( $needle, $haystack )