kiss: go back to doing dependencies externally to pkg_depends for pkg_install

This commit is contained in:
Dylan Araps 2020-09-14 16:07:45 +03:00
parent fc699ff91f
commit 6c7033ad19
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 12 additions and 8 deletions

20
kiss
View File

@ -1116,15 +1116,19 @@ pkg_install() {
[ "$KISS_FORCE" = 1 ] || {
pkg_manifest_verify "$pkg_db/$pkg/manifest"
# Intentional.
# shellcheck disable=2030
(
KISS_PATH=$tar_dir/$pkg/$pkg_db:$KISS_PATH
[ -f "$pkg_db/$pkg/depends" ] && {
while read -r dep dep_type || [ "$dep" ]; do
case "$dep ${dep_type:-null}" in
[!#]*\ null)
pkg_list "$dep" >/dev/null 2>&1 ||
dep_err="$dep_err$dep, "
;;
esac
done < "$pkg_db/$pkg/depends"
pkg_depends "$pkg" explicit runtime 2>/dev/null ||:
[ -z "$deps" ] || die "$pkg" "Missing $deps"
)
[ -z "$dep_err" ] ||
die "$pkg" "Missing ${dep_err%, }"
}
}
run_hook pre-install "$pkg" "$tar_dir/$pkg"