kiss: simplify manifest filter

This commit is contained in:
Dylan Araps 2021-07-17 15:36:37 +03:00
parent 25a5cd543d
commit c3c9049113
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 3 additions and 5 deletions

8
kiss
View File

@ -992,10 +992,7 @@ pkg_conflicts() {
# Filter the tarball's manifest and select only files. Resolve all
# symlinks in file paths as well.
while read -r file; do
# Skip all directories.
case $file in */) continue; esac
while read -r file; do case $file in *[!/])
file=$KISS_ROOT/${file#/}
# Attempt to resolve symlinks by using 'cd'.
@ -1006,7 +1003,8 @@ pkg_conflicts() {
# Print the file with all symlinks in its path
# resolved to their real locations.
printf '%s\n' "${PWD#"$KISS_ROOT"}/${file##*/}"
done < "$tar_dir/$1/$pkg_db/$1/manifest" > "$_tmp_file_pre"
esac done < "$PWD/$pkg_db/$1/manifest" > "$_tmp_file_pre"
cd "$tar_dir/$1"
p_name=$1