From 52eb07fe829870856221dbcf2bca191a64017e71 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 30 Jun 2020 10:14:32 +0300 Subject: [PATCH] kiss: Don't complain about make dependencies during install --- kiss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kiss b/kiss index 1b14649..c36dd5d 100755 --- a/kiss +++ b/kiss @@ -1097,11 +1097,15 @@ pkg_install() { die "File $line missing from tarball but mentioned in manifest" done < "$pkg_db/$pkg_name/manifest" - log "$pkg_name" "Resolving dependencies"; ( - pkg_depends "$pkg_name" explicit filter + log "$pkg_name" "Checking that all dependencies are installed" + [ -f "$tar_dir/$pkg_name/$pkg_db/$pkg_name/depends" ] && + while read -r dep dep_type || [ "$dep" ]; do + [ "${dep##\#*}" ] || continue + [ "$dep_type" ] || pkg_list "$dep" >/dev/null || + install_dep="$install_dep'$dep', " + done < "$tar_dir/$pkg_name/$pkg_db/$pkg_name/depends" - case $deps in *[!\ ]*) printf '%s\n' "${deps# }"; false; esac - ) || die "$1" "Package is missing dependencies" + [ "$install_dep" ] && die "$1" "Package requires ${install_dep%, }" } run_hook pre-install "$pkg_name" "$tar_dir/$pkg_name"