aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoreply@github.com <noreply@github.com>2019-06-18 08:13:15 +0000
committernoreply@github.com <noreply@github.com>2019-06-18 08:13:15 +0000
commit7d232caba208ea3901c97e565239d1d2f5f5122d (patch)
treeaee0cd09f2b3393d94ed502462cd4ffa5bb45009
parent3e50e383f35228f53439d86d5fdf73daeb91f6b6 (diff)
parent7c0a275efd6003294a882e64c30007952be26312 (diff)
downloadcpt-7d232caba208ea3901c97e565239d1d2f5f5122d.tar.gz
Merge branch 'master' into pkg_conflicts
FossilOrigin-Name: 5c250595a27a9164e24d82ce8c4af7a70f55be4d0bfd0e7b288d9804dc895b39
-rwxr-xr-xkiss5
1 files changed, 3 insertions, 2 deletions
diff --git a/kiss b/kiss
index 5f3e440..932672e 100755
--- a/kiss
+++ b/kiss
@@ -12,6 +12,7 @@ log() {
}
source_type() {
+ [ -z "$1" ] && return 1 # No file.
[ -f "$1" ] && return 2 # Local file.
[ -f "$src_dir/${1##*/}" ] && return 3 # Cached downloaded file.
[ -z "${1##git:*}" ] && return 4 # Git repository.
@@ -50,8 +51,8 @@ pkg_depends() {
[ "$1" = install ] && [ "$opt" = make ] && continue
case $missing in
- *" $dep${opt:+ ($opt)},"*) ;;
- *) missing="$missing $dep${opt:+ ($opt)},"
+ *" $dep,"*) ;;
+ *) missing="$missing $dep,"
pkg_setup "$dep"
pkg_depends ;;
esac