From f6a29abd75e2d985de672335f9734a165172e54e Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Sun, 24 Dec 2023 15:44:54 +0300 Subject: [PATCH] fix: align `guix-check` with other `guix-smth` scripts --- contrib/containers/guix/scripts/guix-check | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/containers/guix/scripts/guix-check b/contrib/containers/guix/scripts/guix-check index e16891bc72..419445c163 100755 --- a/contrib/containers/guix/scripts/guix-check +++ b/contrib/containers/guix/scripts/guix-check @@ -2,6 +2,9 @@ set -eo pipefail +# shellcheck source=libexec/prelude.bash +source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash" + if [[ -n "${1}" ]]; then WORKSPACE_PATH="$1" else @@ -14,15 +17,14 @@ if [[ ! -d "$WORKSPACE_PATH" ]]; then fi cd "$WORKSPACE_PATH" -COMMIT_ID="$(git rev-parse --short=12 HEAD)" printf "\nBinaries:\n\n" ( \ -SRC_PATH_PREFIX="guix-build-${COMMIT_ID}/distsrc-" && \ +SRC_PATH_PREFIX="${VERSION_BASE}/distsrc-" && \ sha256sum ${SRC_PATH_PREFIX}*/src/dash{d,-cli,-tx,-wallet}{,.exe} && \ sha256sum ${SRC_PATH_PREFIX}*/src/qt/dash-qt{,.exe} && \ sha256sum ${SRC_PATH_PREFIX}*/src/test/test_dash{,.exe} \ ) | sort -k 2 printf "\nArchives:\n\n" -find "guix-build-${COMMIT_ID}/output" -type f | grep -v SHA256 | xargs sha256sum | sort -k 2 +find "${OUTDIR_BASE}" -type f | grep -v SHA256 | xargs sha256sum | sort -k 2