diff options
| -rwxr-xr-x | kiss | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -310,13 +310,13 @@ pkg_extract() { # extraction. Other filetypes are simply copied to '$mak_dir' # which allows for manual extraction. *://*.tar|*://*.tar.??|*://*.tar.???|*://*.tar.????|*://*.tgz) - decompress "$src_dir/$1/${src##*/}" | "$tar" xf - || + decompress "$src_dir/$1/${src##*/}" | "$tar" -xf - || die "$1" "Couldn't extract ${src##*/}" # Again, decompress but to 'tar tf -' this time. We get the # base files in the package. We use this to do our version # of 'strip-components'. - decompress "$src_dir/$1/${src##*/}" | "$tar" tf - | + decompress "$src_dir/$1/${src##*/}" | "$tar" -tf - | while read -r file; do printf '%s\n' "${file%%/*}" done | uniq | @@ -564,7 +564,7 @@ pkg_tar() { read -r version release < "$(pkg_find "$1")/version" # Create a tarball from the contents of the built package. - "$tar" cf - -C "$pkg_dir/$1" . | + "$tar" -cf - -C "$pkg_dir/$1" . | case ${KISS_COMPRESS:=gz} in bz2) bzip2 -z ;; xz) xz -zT 0 ;; @@ -1043,7 +1043,7 @@ pkg_install() { log "$pkg_name" "Extracting $tar_file" # Extract the tarball to catch any errors before installation begins. - decompress "$tar_file" | "$tar" pxf - -C "$tar_dir/$pkg_name" + decompress "$tar_file" | "$tar" -pxf - -C "$tar_dir/$pkg_name" [ -f "$tar_dir/$pkg_name/$pkg_db/$pkg_name/manifest" ] || die "'${tar_file##*/}' is not a valid KISS package" |