kiss-community
/
kiss
mirror of https://codeberg.org/kiss-community/kiss
1
0
Fork 1
Code Issues Wiki

kiss: misc cleanup

This commit is contained in:
Dylan Araps 2021-07-21 08:07:51 +03:00
parent f8256d699d
commit 94523bd62f
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kiss
View File

@ -757,18 +757,19 @@ pkg_manifest() {
} }
pkg_manifest_validate() { pkg_manifest_validate() {
log "$1" "Checking if manifest valid" # NOTE: _pkg comes from caller.
log "$_pkg" "Checking if manifest valid"
while read -r line; do while read -r line; do
[ -e "$tar_dir/$1$line" ] || [ -h "$tar_dir/$1$line" ] || { [ -e "$tar_dir/$_pkg$line" ] || [ -h "$tar_dir/$_pkg$line" ] || {
printf '%s\n' "$line" printf '%s\n' "$line"
set -- "$@" "$line" set -- "$@" "$line"
} }
done < "$pkg_db/$1/manifest" done < "$pkg_db/$_pkg/manifest"
case $# in [2-9]|[1-9][0-9]*) for f do
die "$1" "manifest contains $(($# - 1)) non-existent files" die "$_pkg" "manifest contains $# non-existent files"
esac done
} }
pkg_manifest_replace() { pkg_manifest_replace() {
@ -1455,7 +1456,7 @@ pkg_install() {
# Intended behavior. # Intended behavior.
# shellcheck disable=2030,2031 # shellcheck disable=2030,2031
equ "$KISS_FORCE" 1 || { equ "$KISS_FORCE" 1 || {
pkg_manifest_validate "$_pkg" pkg_manifest_validate
pkg_installable "$_pkg" "$PWD/$pkg_db/$_pkg/depends" pkg_installable "$_pkg" "$PWD/$pkg_db/$_pkg/depends"
} }