From c3c9049113bb1691d817e3fc86cb302fed4852e5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 17 Jul 2021 15:36:37 +0300 Subject: [PATCH] kiss: simplify manifest filter --- kiss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kiss b/kiss index 830b099..ceef591 100755 --- a/kiss +++ b/kiss @@ -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