aboutsummaryrefslogtreecommitdiff
path: root/kiss
diff options
context:
space:
mode:
authordylan.araps@gmail.com <dylan.araps@gmail.com>2019-06-16 14:44:41 +0000
committerdylan.araps@gmail.com <dylan.araps@gmail.com>2019-06-16 14:44:41 +0000
commita73dcec1b786bbde4968406736d3f2696b1ad61f (patch)
treeeadec7b8a1ca8ba9eea15087ba719c9cd4de0d07 /kiss
parent9066c0a8c9cca079d893585d0b2c72f4fa402b1f (diff)
parentef1e1e74a2ad4f9b0eabf917a735382ef1376c6e (diff)
downloadcpt-a73dcec1b786bbde4968406736d3f2696b1ad61f.tar.gz
Merge branch 'master' of github.com:kissx/kiss
FossilOrigin-Name: 67c11b7a4342e90e0d8eea2a90f274ca02bfe2db7bb21abe856c0002c6863e61
Diffstat (limited to 'kiss')
-rwxr-xr-xkiss15
1 files changed, 10 insertions, 5 deletions
diff --git a/kiss b/kiss
index 0990a1b..d7f154a 100755
--- a/kiss
+++ b/kiss
@@ -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,9 @@ args() {
pkg_checksum
log "Generated checksums." ;;
- i*) pkg_install ;;
+ i*) pkg_depends install
+ pkg_install ;;
+
l*) pkg_list "$2" ;;
r*) pkg_remove || die "Package '$name' not installed" ;;
u*) pkg_updates ;;