From ed7855cc63e428d099e3a8af1f0f79e85b0c701c Mon Sep 17 00:00:00 2001 From: Ashley Davis Date: Fri, 19 Jan 2024 16:25:19 +0000 Subject: [PATCH] tweak checkhash script Signed-off-by: Ashley Davis --- hack/util/checkhash.sh | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/hack/util/checkhash.sh b/hack/util/checkhash.sh index 2b864c66a..3c1d57a40 100755 --- a/hack/util/checkhash.sh +++ b/hack/util/checkhash.sh @@ -19,16 +19,36 @@ set -eu -o pipefail # This script takes the hash of its first argument and verifies it against the # hex hash given in its second argument +function usage_and_exit() { + echo "usage: $0 " + echo "or: LEARN_FILE= $0 " + exit 1 +} + +HASH_TARGET=${1:-} +EXPECTED_HASH=${2:-} + +if [[ -z $HASH_TARGET ]]; then + usage_and_exit +fi + +if [[ -z $EXPECTED_HASH ]]; then + usage_and_exit +fi + SHASUM=$(./hack/util/hash.sh "$1") -# When running 'make learn-sha-tools', we don't want this script to fail. -# Instead we log what sha values are wrong, so the make.mk file can be updated. -if [ "$SHASUM" != "$2" ] && [ "${LEARN_FILE:-}" != "" ]; then - echo "s/$2/$SHASUM/g" >> "${LEARN_FILE:-}" +if [[ "$SHASUM" == "$EXPECTED_HASH" ]]; then exit 0 fi -if [ "$SHASUM" != "$2" ]; then - echo "invalid checksum for \"$1\": wanted \"$2\" but got \"$SHASUM\"" - exit 1 -fi \ No newline at end of file +# When running 'make learn-sha-tools', we don't want this script to fail. +# Instead we log what sha values are wrong, so the make.mk file can be updated. + +if [ "${LEARN_FILE:-}" != "" ]; then + echo "s/$EXPECTED_HASH/$SHASUM/g" >> "${LEARN_FILE:-}" + exit 0 +fi + +echo "invalid checksum for \"$HASH_TARGET\": wanted \"$EXPECTED_HASH\" but got \"$SHASUM\"" +exit 1