From f9863106c5a42f40a7897efdc3de25b3d735a7db Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 21:04:33 +0300 Subject: [PATCH] extract: Added support for specifying destination directory for extraction. --- puke | 10 +++++----- repo/zlib/manifest | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/puke b/puke index d4f39b61..26d848b8 100755 --- a/puke +++ b/puke @@ -36,7 +36,7 @@ pkg_depends() { } pkg_sources() { - while read -r src; do + while read -r src _; do case $(source_type "$src"; echo $?) in 4) git clone "${src##git:}" "$mak_dir" ;; 5) wget -P "$src_dir" "$src" || die "Failed to download $src." ;; @@ -46,7 +46,7 @@ pkg_sources() { } pkg_checksum() { - while read -r src; do + while read -r src _; do case $(source_type "$src"; echo $?) in 2) src_path=$src ;; 3) src_path=$src_dir/${src##*/} ;; @@ -64,13 +64,13 @@ pkg_verify() { } pkg_extract() { - while read -r src; do + while read -r src dest; do case $(source_type "$src"; echo $?)-$src in 2-*) cp -f "$src" "$mak_dir" ;; 3-*.tar*) - tar xf "$src_dir/${src##*/}" -C "$mak_dir" --strip-components 1 || - die "Couldn't extract ${src##*/}" ;; + tar xf "$src_dir/${src##*/}" -C "$mak_dir/$dest" \ + --strip-components 1 || die "Couldn't extract ${src##*/}" ;; [01]-*) die "${src##*/} not found." esac diff --git a/repo/zlib/manifest b/repo/zlib/manifest index 0faa23e9..d653444b 100644 --- a/repo/zlib/manifest +++ b/repo/zlib/manifest @@ -1,24 +1,24 @@ /var/db/puke/zlib/version -/var/db/puke/zlib/sources -/var/db/puke/zlib/checksums /var/db/puke/zlib/build +/var/db/puke/zlib/checksums /var/db/puke/zlib/manifest +/var/db/puke/zlib/sources /var/db/puke/zlib /var/db/puke /var/db /var +/usr/include/zlib.h +/usr/include/zconf.h +/usr/include +/usr/lib/pkgconfig/zlib.pc +/usr/lib/pkgconfig +/usr/lib/libz.a +/usr/lib/libz.so +/usr/lib/libz.so.1 +/usr/lib/libz.so.1.2.11 +/usr/lib /usr/share/man/man3/zlib.3 /usr/share/man/man3 /usr/share/man /usr/share -/usr/lib/pkgconfig/zlib.pc -/usr/lib/pkgconfig -/usr/lib/libz.so.1 -/usr/lib/libz.a -/usr/lib/libz.so -/usr/lib/libz.so.1.2.11 -/usr/lib -/usr/include/zconf.h -/usr/include/zlib.h -/usr/include /usr