diff options
author | noreply@github.com <noreply@github.com> | 2019-06-15 09:27:34 +0000 |
---|---|---|
committer | noreply@github.com <noreply@github.com> | 2019-06-15 09:27:34 +0000 |
commit | ef1e1e74a2ad4f9b0eabf917a735382ef1376c6e (patch) | |
tree | 61722726a0612bed629e8654ed59a0992d3a4ec3 | |
parent | e650b460d71b07eaacb5ace74fd0856427382a9c (diff) | |
parent | ca216be4132a50b7953c577e9edf2b79654c439c (diff) | |
download | cpt-ef1e1e74a2ad4f9b0eabf917a735382ef1376c6e.tar.gz |
Merge pull request #7 from kissx/makedepends2
depends: Add make depends.
FossilOrigin-Name: e2c120b71ba5230df8adb497b311b61e92fe41787e6906be649acffaa7680332
-rwxr-xr-x | kiss | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -41,14 +41,17 @@ pkg_setup() { } pkg_depends() { - while read -r dep; do - pkg_list "$dep" || + while read -r dep opt; do + pkg_list "$dep" || { + [ "$1" = install ] && [ "$opt" = make ] && continue + case $missing in - *" $dep,"*) ;; - *) missing="$missing $dep," + *" $dep${opt:+ ($opt)},"*) ;; + *) missing="$missing $dep${opt:+ ($opt)}," pkg_setup "$dep" pkg_depends ;; esac + } done 2>/dev/null < depends } @@ -200,7 +203,7 @@ args() { pkg_checksum log "Generated checksums." ;; - i*) pkg_depends + i*) pkg_depends install pkg_install ;; l*) pkg_list "$2" ;; |