kiss: fix pkg_find exit
This commit is contained in:
parent
04eee58366
commit
498d596352
6
kiss
6
kiss
|
@ -174,6 +174,8 @@ pkg_extract() {
|
||||||
pkg_depends() {
|
pkg_depends() {
|
||||||
# Resolve all dependencies and install them in the right order.
|
# Resolve all dependencies and install them in the right order.
|
||||||
|
|
||||||
|
repo_dir=$(pkg_find "$1")
|
||||||
|
|
||||||
# This does a depth-first search. The deepest dependencies are
|
# This does a depth-first search. The deepest dependencies are
|
||||||
# listed first and then the parents in reverse order.
|
# listed first and then the parents in reverse order.
|
||||||
contains "$deps" "$1" || {
|
contains "$deps" "$1" || {
|
||||||
|
@ -181,7 +183,7 @@ pkg_depends() {
|
||||||
# packages. Keep doing this.
|
# packages. Keep doing this.
|
||||||
while read -r dep _; do
|
while read -r dep _; do
|
||||||
[ "${dep##\#*}" ] && pkg_depends "$dep"
|
[ "${dep##\#*}" ] && pkg_depends "$dep"
|
||||||
done 2>/dev/null < "$(pkg_find "$1")/depends" ||:
|
done 2>/dev/null < "$repo_dir/depends" ||:
|
||||||
|
|
||||||
# After child dependencies are added to the list,
|
# After child dependencies are added to the list,
|
||||||
# add the package which depends on them.
|
# add the package which depends on them.
|
||||||
|
@ -908,7 +910,7 @@ args() {
|
||||||
for pkg; do
|
for pkg; do
|
||||||
case $pkg in
|
case $pkg in
|
||||||
*.tar.gz) deps="$deps $pkg " ;;
|
*.tar.gz) deps="$deps $pkg " ;;
|
||||||
*) pkg_depends "$pkg" 2>/dev/null
|
*) pkg_depends "$pkg"
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue