From 3c7d1aadfbe558bdee90ff73ff63a721d1db7da5 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Wed, 15 Apr 2020 18:44:00 -0700 Subject: Allow overriding sha256 command through SHA256SUM This way, oasis can be bootstrapped on other operating systems by setting SHA256SUM='shasum -a 256'. --- pkg/git/fetch.sh | 9 ++++++--- pkg/linux-headers/fetch.sh | 9 ++++++--- pkg/openbsd/fetch.sh | 11 +++++++---- scripts/fetch-curl.sh | 9 ++++++--- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/pkg/git/fetch.sh b/pkg/git/fetch.sh index 48edce2c..7e257f44 100644 --- a/pkg/git/fetch.sh +++ b/pkg/git/fetch.sh @@ -1,3 +1,6 @@ +: ${SHA256SUM:=sha256sum} +: ${PAXREAD:=pax -r} + set -e (. ./scripts/fetch-git.sh "$@") @@ -9,10 +12,10 @@ if [ -e src/man ] ; then rm -rf src/man fi -if ! sha256sum -c sha256 2>/dev/null ; then +if ! $SHA256SUM -c sha256 2>/dev/null ; then curl -L -O -K url - sha256sum -c sha256 + $SHA256SUM -c sha256 fi read -r checksum archive /dev/null ; then +if ! $SHA256SUM -c sha256 2>/dev/null ; then curl -L -K url -O - sha256sum -c sha256 + $SHA256SUM -c sha256 fi read -r _ archive /dev/null ; then +if ! $SHA256SUM -c sha256 2>/dev/null ; then curl -L -K url -O - sha256sum -c sha256 + $SHA256SUM -c sha256 fi -zcat src.tar.gz | ${PAXREAD:-pax -r} -s ',^,src/,' \ +zcat src.tar.gz | $PAXREAD -s ',^,src/,' \ 'bin/pax/*' \ 'include/*' \ 'lib/libc/*' \ @@ -29,6 +32,6 @@ zcat src.tar.gz | ${PAXREAD:-pax -r} -s ',^,src/,' \ 'usr.bin/rsync/*' \ 'usr.bin/yacc/*' \ 'usr.sbin/acme-client/*' -zcat sys.tar.gz | ${PAXREAD:-pax -r} -s ',^,src/,' 'sys/sys/*' +zcat 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 index 4604a398..a25c0582 100644 --- a/scripts/fetch-curl.sh +++ b/scripts/fetch-curl.sh @@ -1,3 +1,6 @@ +: ${SHA256SUM:=sha256sum} +: ${PAXREAD:=pax -r} + set -e if [ "$#" != 1 ] ; then @@ -14,9 +17,9 @@ if [ -e src ] ; then rm -rf src fi -if ! sha256sum -c sha256 2>/dev/null ; then +if ! $SHA256SUM -c sha256 2>/dev/null ; then curl -L -K url -O - sha256sum -c sha256 + $SHA256SUM -c sha256 fi while read -r checksum archive ; do @@ -31,7 +34,7 @@ while read -r checksum archive ; do tool= esac if [ -n "$tool" ] ; then - "$tool" "$archive" | ${PAXREAD:-pax -r} -s ',^[^/]*,src,' '*/*' + "$tool" "$archive" | $PAXREAD -s ',^[^/]*,src,' '*/*' fi done