From 481524661c3da5addcbf1d31b06ee5a532545baa Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 17 May 2024 11:10:24 -0300 Subject: [PATCH] Fix comparison script --- .github/verify-version.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/verify-version.sh b/.github/verify-version.sh index c3ee0af..4ceb087 100755 --- a/.github/verify-version.sh +++ b/.github/verify-version.sh @@ -1,13 +1,18 @@ -#!/usr/bin/env +#!/usr/bin/env bash + +# This script verifies that the version of Nix installed on the runner +# matches the version supplied in the first argument. EXPECTED_VERSION="${1}" -NIX_VERSION_OUTPUT=$(nix --version) -NIX_VERSION=$(echo "${NIX_VERSION_OUTPUT}" | awk '{print $NF}') +INSTALLED_NIX_VERSION_OUTPUT=$(nix --version) +INSTALLED_NIX_VERSION=$(echo "${INSTALLED_NIX_VERSION_OUTPUT}" | awk '{print $NF}') EXPECTED_OUTPUT="nix (Nix) ${EXPECTED_VERSION}" -if [ "${NIX_VERSION_OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then - echo "Nix version ${NIX_VERSION} didn't match expected version ${EXPECTED_VERSION}" + +if [ "${INSTALLED_NIX_VERSION_OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then + echo "Nix version ${INSTALLED_NIX_VERSION} didn't match expected version ${EXPECTED_VERSION}" exit 1 else - echo "Success! Nix version ${NIX_VERSION} installed as expected" + echo "Success! Nix version ${INSTALLED_NIX_VERSION} installed as expected" + exit 0 fi