bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: remove unneeded subshell from pkg_depends

Browse Source
This commit is contained in:
Dylan Araps 2021-07-03 15:08:02 +00:00
parent 65474c56e3
commit 84f1eb7c98
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kiss
View File

@ -193,15 +193,17 @@ pkg_list() {
[ "$1" ] || { set +f; set -f -- *; } [ "$1" ] || { set +f; set -f -- *; }
# Loop over each package and print its name and version. # Loop over each package and print its name and version.
for pkg do for _list_pkg do
[ -d "$pkg" ] || { [ -d "$_list_pkg" ] || {
log "$pkg" "not installed" log "$_list_pkg" "not installed"
return 1 return 1
} }
read -r version 2>/dev/null < "$pkg/version" || version=null read -r version 2>/dev/null < "$_list_pkg/version" || version=null
printf '%s\n' "$pkg $version" printf '%s\n' "$_list_pkg $version"
done done
cd "$OLDPWD"
} }
pkg_cache() { pkg_cache() {
@ -377,7 +379,7 @@ pkg_depends() {
# dependencies are listed first and then the parents in reverse order. # dependencies are listed first and then the parents in reverse order.
contains "$deps" "$1" || { contains "$deps" "$1" || {
# Filter out non-explicit, aleady installed dependencies. # Filter out non-explicit, aleady installed dependencies.
[ "$3" ] && [ -z "$2" ] && (pkg_list "$1" >/dev/null 2>&1) && return [ "$3" ] && [ -z "$2" ] && pkg_list "$1" >/dev/null 2>&1 && return
# Detect circular dependencies and bail out. # Detect circular dependencies and bail out.
# Looks for multiple repeating patterns of (dep dep_parent) (5 is max). # Looks for multiple repeating patterns of (dep dep_parent) (5 is max).