kiss-community/kiss
1
0
Fork 1
mirror of https://codeberg.org/kiss-community/kiss synced 2024-12-25 00:20:05 -07:00
Code Issues Wiki

Merge branch 'pkg_conflicts' of github.com:kissx/kiss into pkg_conflicts

Browse Source
This commit is contained in:
Dylan Araps 2019-06-18 11:40:36 +03:00
commit b15b18491c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kiss
View File

@ -12,6 +12,7 @@ log() {
} }
source_type() { source_type() {
[ -z "$1" ] && return 1 # No file.
[ -f "$1" ] && return 2 # Local file. [ -f "$1" ] && return 2 # Local file.
[ -f "$src_dir/${1##*/}" ] && return 3 # Cached downloaded file. [ -f "$src_dir/${1##*/}" ] && return 3 # Cached downloaded file.
[ -z "${1##git:*}" ] && return 4 # Git repository. [ -z "${1##git:*}" ] && return 4 # Git repository.
@ -50,8 +51,8 @@ pkg_depends() {
[ "$1" = install ] && [ "$opt" = make ] && continue [ "$1" = install ] && [ "$opt" = make ] && continue
case $missing in case $missing in
*" $dep${opt:+ ($opt)},"*) ;; *" $dep,"*) ;;
*) missing="$missing $dep${opt:+ ($opt)}," *) missing="$missing $dep,"
pkg_setup "$dep" pkg_setup "$dep"
pkg_depends ;; pkg_depends ;;
esac esac