From ca7d8217d5a2282d96890c4f5895ef0b87e755d6 Mon Sep 17 00:00:00 2001 From: merakor Date: Sat, 3 Jul 2021 00:14:14 +0000 Subject: cpt-lib: fix pax usage FossilOrigin-Name: 5f74fbab217d6da414faf1cc1ddcc8a1a2e39c02e542af4c31ae9ffb01d20209 --- src/cpt-lib.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/cpt-lib.in b/src/cpt-lib.in index e03678c..b4fb79d 100644 --- a/src/cpt-lib.in +++ b/src/cpt-lib.in @@ -950,7 +950,8 @@ pkg_tar() { read -r version release < "$(pkg_find "$1")/version" # Create a tarball from the contents of the built package. - pax -w . | + cd "$pkg_dir/$1" + pax -w . | case $CPT_COMPRESS in bz2) bzip2 -z ;; xz) xz -zT 0 ;; @@ -1544,7 +1545,7 @@ pkg_install() { pkg_rsync() { rsync "--chown=$USER:$USER" --chmod=Du-s,Dg-s,Do-s \ -WhHKa --no-compress --exclude /etc "${1:---}" \ - "$tar_dir/$pkg_name" "$CPT_ROOT/" + "$tar_dir/$pkg_name/" "$CPT_ROOT/" } # Install the package by using 'rsync' and overwrite any existing files -- cgit v1.2.3