From 37da7f822cb7ae60fd3fbdb2de3583997e150cf2 Mon Sep 17 00:00:00 2001 From: "herdiansyah@netc.eu" Date: Fri, 14 Jun 2019 16:47:20 +0000 Subject: install: add dependency check In case of a package already exist in $bin_dir if it isn't built in that system (e.g. by copying the tar file manually from another kiss instance), don't blindly install it but check if the depends are properly installed. Otherwise the binaries won't run properly. FossilOrigin-Name: f52346ecd23e37df73868d8d5f001bd882915695115164b438e13b81d4c99678 --- kiss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kiss b/kiss index 0990a1b..3231869 100755 --- a/kiss +++ b/kiss @@ -200,7 +200,9 @@ args() { pkg_checksum log "Generated checksums." ;; - i*) pkg_install ;; + i*) pkg_depends + pkg_install ;; + l*) pkg_list "$2" ;; r*) pkg_remove || die "Package '$name' not installed" ;; u*) pkg_updates ;; -- cgit v1.2.3 From 3fe6f27b34b8a391dd99d2faa67ec30067cd98ec Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Sat, 15 Jun 2019 06:19:19 +0000 Subject: depends: Add make depends. FossilOrigin-Name: 2cc7e7b4863dc721e7b2b2ee35ff4cf0c91c53d759d7a085870ee3365e3342bc --- kiss | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/kiss b/kiss index 0990a1b..8924101 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 ] && return + 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 ;; -- cgit v1.2.3 From 392803d402f937a3e2b9873c88140df90c02bb35 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Sat, 15 Jun 2019 06:22:16 +0000 Subject: depends: Use continue FossilOrigin-Name: ff46fc7b4522d7b1b0711db633c5af5c71a30e53b2c140d2a2d6fdadf576af8f --- kiss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiss b/kiss index 8924101..d7f154a 100755 --- a/kiss +++ b/kiss @@ -43,7 +43,7 @@ pkg_setup() { pkg_depends() { while read -r dep opt; do pkg_list "$dep" || { - [ "$1" = install ] && [ "$opt" = make ] && return + [ "$1" = install ] && [ "$opt" = make ] && continue case $missing in *" $dep${opt:+ ($opt)},"*) ;; -- cgit v1.2.3