oasis

commit: 3c7d1aadfbe558bdee90ff73ff63a721d1db7da5
parent 7db12b30b2580490b768bfc28a7dcc10f8cda857
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 15 Apr 2020 18:44:00 -0700

Allow overriding sha256 command through SHA256SUM

This way, oasis can be bootstrapped on other operating systems by
setting SHA256SUM='shasum -a 256'.

Diffstat:
M
pkg/git/fetch.sh
9
++++++---
M
pkg/linux-headers/fetch.sh
9
++++++---
M
pkg/openbsd/fetch.sh
11
+++++++----
M
scripts/fetch-curl.sh
9
++++++---

4 files changed, 25 insertions(+), 13 deletions(-)
diff --git 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 <sha256
-xzcat "$archive" | ${PAXREAD:-pax -r} -s ',^\.,src/man,'
+xzcat "$archive" | $PAXREAD -s ',^\.,src/man,'
diff --git a/pkg/linux-headers/fetch.sh b/pkg/linux-headers/fetch.sh
@@ -1,3 +1,6 @@
+: ${SHA256SUM:=sha256sum}
+: ${PAXREAD:=pax -r}
+
 set -e
 
 dir=$1
@@ -9,14 +12,14 @@ 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
 
 read -r _ archive <sha256
 
-xzcat "$archive" | ${PAXREAD:-pax -r} -s ',^[^/]*,src,' \
+xzcat "$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
@@ -1,3 +1,6 @@
+: ${SHA256SUM:=sha256sum}
+: ${PAXREAD:=pax -r}
+
 set -e
 
 dir=$1
@@ -9,12 +12,12 @@ 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
 
-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
@@ -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 <sha256