diff options
author | merakor <cem@ckyln.com> | 2020-05-05 20:03:45 +0000 |
---|---|---|
committer | merakor <cem@ckyln.com> | 2020-05-05 20:03:45 +0000 |
commit | fd92df4d5f971e14ae5eb7d2986922376b4a21cc (patch) | |
tree | 9f7ad602c54b9120c554f2f245aafddfebe9be6f | |
parent | b2ebb02b8fde0ad237782f6d0a6eab4ae7167a50 (diff) | |
download | cpt-fd92df4d5f971e14ae5eb7d2986922376b4a21cc.tar.gz |
kiss: revert to using keys instead of flags
FossilOrigin-Name: fe521559cc1fd7e9ebb88f2a5c581129acbe309ed0e5128ca85c16563e3d789e
-rwxr-xr-x | kiss | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -321,11 +321,11 @@ pkg_extract() { die "$1" "Couldn't decompres ${src##*/}" } - "$tar" -xf "$src_dir/$1/$src_tar" || die "$1" "Couldn't extract $src_tar" + "$tar" xf "$src_dir/$1/$src_tar" || die "$1" "Couldn't extract $src_tar" # We now list the contents of the tarball so we can do our # version of 'strip-components'. - "$tar" -tf "$src_dir/$1/$src_tar" | + "$tar" tf "$src_dir/$1/$src_tar" | while read -r file; do printf '%s\n' "${file%%/*}"; done | # Do not repeat files. @@ -580,7 +580,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 ;; @@ -1059,7 +1059,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" |