From 0dc51890b545c0b74a8450b539c76238358cdd65 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 28 Jul 2024 09:21:43 -0400 Subject: [PATCH] fixup! --- src/dockerutils.sh.sha256 | 1 - src/salt-macros.sh.sha256 | 1 - src/squash_fixups.sh.sha256 | 1 - src/sum.sh | 10 +++++++--- src/sum.sh.sha256 | 1 - 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dockerutils.sh.sha256 b/src/dockerutils.sh.sha256 index d74e023..e69de29 100644 --- a/src/dockerutils.sh.sha256 +++ b/src/dockerutils.sh.sha256 @@ -1 +0,0 @@ -a2577b1eb4dfc9dd142bc8bc91f6c569101eef61d1c47ddbd4e9625079fdb5a4 diff --git a/src/salt-macros.sh.sha256 b/src/salt-macros.sh.sha256 index a1a1524..e69de29 100644 --- a/src/salt-macros.sh.sha256 +++ b/src/salt-macros.sh.sha256 @@ -1 +0,0 @@ -5027c07471f7a1413d5cc10da21f01bc167c6b69d1a3913cb739208483cce79b diff --git a/src/squash_fixups.sh.sha256 b/src/squash_fixups.sh.sha256 index a1c48ab..e69de29 100644 --- a/src/squash_fixups.sh.sha256 +++ b/src/squash_fixups.sh.sha256 @@ -1 +0,0 @@ -b1eb4d54c3623dfdaef8293ce8fa2bfdb1397d59d135711e43a5a21e882cc2ed diff --git a/src/sum.sh b/src/sum.sh index e7863d9..91ee664 100644 --- a/src/sum.sh +++ b/src/sum.sh @@ -15,10 +15,14 @@ calculate_hashes() { return 1 fi - # Use shasum by default, and fallback to sha256sum if available - local hash_cmd="shasum -a 256" + # Determine the hash command to use if command -v sha256sum >/dev/null 2>&1; then - hash_cmd="sha256sum" + local hash_cmd="sha256sum" + elif command -v shasum >/dev/null 2>&1; then + local hash_cmd="shasum -a 256" + else + echo "Neither sha256sum nor shasum is available." + return 1 fi # Function to process the src directory diff --git a/src/sum.sh.sha256 b/src/sum.sh.sha256 index bbc6d69..e69de29 100644 --- a/src/sum.sh.sha256 +++ b/src/sum.sh.sha256 @@ -1 +0,0 @@ -5d7646254d8f39bbd65b4473a3c8854eb088a566c0fc60ee9948a66ac8797e10