1
0
mirror of https://codeberg.org/kiss-community/kiss synced 2024-12-24 16:10:05 -07:00

Merge branch 'master' into pkg_conflicts

This commit is contained in:
black 2019-06-18 11:13:15 +03:00 committed by GitHub
commit 7158de8b53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

5
kiss
View File

@ -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