logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: ea72d6bab9e53b63d0ad391fbb6019adf6c8a9e2
parent b275ed3c0711327bff6c1e67dbeaac8c5452a0e4
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 15 Apr 2020 18:52:57 -0700

Use main compression tool instead of *cat variants

Diffstat:

Mpkg/git/fetch.sh2+-
Mpkg/linux-headers/fetch.sh2+-
Mpkg/openbsd/fetch.sh4++--
Mscripts/fetch-curl.sh8++++----
4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/git/fetch.sh b/pkg/git/fetch.sh @@ -18,4 +18,4 @@ if ! $SHA256SUM -c sha256 2>/dev/null ; then fi read -r checksum archive <sha256 -xzcat "$archive" | $PAXREAD -s ',^\.,src/man,' +xz -d -c "$archive" | $PAXREAD -s ',^\.,src/man,' diff --git a/pkg/linux-headers/fetch.sh b/pkg/linux-headers/fetch.sh @@ -19,7 +19,7 @@ fi read -r _ archive <sha256 -xzcat "$archive" | $PAXREAD -s ',^[^/]*,src,' \ +xz -d -c "$archive" | $PAXREAD -s ',^[^/]*,src,' \ 'linux-*/Makefile' \ 'linux-*/arch/*/include/uapi' \ 'linux-*/arch/*/syscalls' \ diff --git a/pkg/openbsd/fetch.sh b/pkg/openbsd/fetch.sh @@ -17,7 +17,7 @@ if ! $SHA256SUM -c sha256 2>/dev/null ; then $SHA256SUM -c sha256 fi -zcat src.tar.gz | $PAXREAD -s ',^,src/,' \ +gzip -d -c src.tar.gz | $PAXREAD -s ',^,src/,' \ 'bin/pax/*' \ 'include/*' \ 'lib/libc/*' \ @@ -32,6 +32,6 @@ zcat src.tar.gz | $PAXREAD -s ',^,src/,' \ 'usr.bin/rsync/*' \ 'usr.bin/yacc/*' \ 'usr.sbin/acme-client/*' -zcat sys.tar.gz | $PAXREAD -s ',^,src/,' 'sys/sys/*' +gzip -d -c sys.tar.gz | $PAXREAD -s ',^,src/,' 'sys/sys/*' git apply -v --whitespace=nowarn --directory "$dir/src" patch/* diff --git a/scripts/fetch-curl.sh b/scripts/fetch-curl.sh @@ -25,16 +25,16 @@ fi while read -r checksum archive ; do case $archive in *.tar.gz|*.tgz) - tool=zcat ;; + tool=gzip ;; *.tar.bz2) - tool=bzcat ;; + tool=bzip2 ;; *.tar.xz) - tool=xzcat ;; + tool=xz ;; *) tool= esac if [ -n "$tool" ] ; then - "$tool" "$archive" | $PAXREAD -s ',^[^/]*,src,' '*/*' + "$tool" -d -c "$archive" | $PAXREAD -s ',^[^/]*,src,' '*/*' fi done <sha256