mirror of
https://codeberg.org/kiss-community/kiss
synced 2024-09-28 12:22:39 -06:00
kiss: simplify manifest filter
This commit is contained in:
parent
25a5cd543d
commit
c3c9049113
8
kiss
8
kiss
@ -992,10 +992,7 @@ pkg_conflicts() {
|
|||||||
|
|
||||||
# Filter the tarball's manifest and select only files. Resolve all
|
# Filter the tarball's manifest and select only files. Resolve all
|
||||||
# symlinks in file paths as well.
|
# symlinks in file paths as well.
|
||||||
while read -r file; do
|
while read -r file; do case $file in *[!/])
|
||||||
# Skip all directories.
|
|
||||||
case $file in */) continue; esac
|
|
||||||
|
|
||||||
file=$KISS_ROOT/${file#/}
|
file=$KISS_ROOT/${file#/}
|
||||||
|
|
||||||
# Attempt to resolve symlinks by using 'cd'.
|
# Attempt to resolve symlinks by using 'cd'.
|
||||||
@ -1006,7 +1003,8 @@ pkg_conflicts() {
|
|||||||
# Print the file with all symlinks in its path
|
# Print the file with all symlinks in its path
|
||||||
# resolved to their real locations.
|
# resolved to their real locations.
|
||||||
printf '%s\n' "${PWD#"$KISS_ROOT"}/${file##*/}"
|
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"
|
cd "$tar_dir/$1"
|
||||||
p_name=$1
|
p_name=$1
|
||||||
|
Loading…
Reference in New Issue
Block a user