kiss: handle dependencies 'smarter'

This commit is contained in:
Dylan Araps 2019-09-13 21:30:16 +03:00
parent 519acc14f8
commit 728965343e

5
kiss
View File

@ -350,6 +350,9 @@ pkg_build() {
log "Resolving dependencies" log "Resolving dependencies"
for pkg; do pkg_depends "$pkg" explicit; done for pkg; do pkg_depends "$pkg" explicit; done
# If an explicit package is a dependency of another explicit
# package, remove it from the explicit list as it needs to be
# installed as a dependency.
for pkg; do for pkg; do
case $deps in case $deps in
*" $pkg "*) explicit=$(echo "$explicit" | sed "s/ $pkg / /g") *" $pkg "*) explicit=$(echo "$explicit" | sed "s/ $pkg / /g")
@ -364,7 +367,7 @@ pkg_build() {
# are included and ensure that all installed packages are excluded. # are included and ensure that all installed packages are excluded.
for pkg; do for pkg; do
case $explicit_build in case $explicit_build in
*" $pkg "*|-) ;; *" $pkg "*) ;;
*) pkg_list "$pkg" >/dev/null && continue ;; *) pkg_list "$pkg" >/dev/null && continue ;;
esac esac