From 397a5c26a70be654709a3a9909c1a2778c322462 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 20:37:01 -0300
Subject: [PATCH 01/16] Update input description and add test workflow

---
 .github/workflows/ci.yml | 10 ++++++++++
 action.yml               |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ea4947a..109b181 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -211,3 +211,13 @@ jobs:
         with:
           duration: 5m
           authorized-users: grahamc
+
+  install-with-non-default-inputs:
+    name: Install Nix using non-default Action inputs
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@main
+        with:
+          source-url: https://install.determinate.systems/nix-installer/stable/X64-Linux
+      - run: nix --version
diff --git a/action.yml b/action.yml
index fb27ca3..b44d1ed 100644
--- a/action.yml
+++ b/action.yml
@@ -92,7 +92,7 @@ inputs:
     description: The tag of `nix-installer` to use (conflicts with `source-revision`, `source-branch`, `source-pr`)
     required: false
   source-url:
-    description: A URL pointing to a `nix-installer.sh` script
+    description: A URL pointing to a `nix-installer` executable
     required: false
   nix-package-url:
     description: The Nix package URL

From e8f36a90cd9b81d12c4dbf0d1d7efb66a6d4a297 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 20:38:07 -0300
Subject: [PATCH 02/16] Fix URL for executable

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 109b181..8fa0704 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -219,5 +219,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
         with:
-          source-url: https://install.determinate.systems/nix-installer/stable/X64-Linux
+          source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.19.0/nix-installer-x86_64-linux
       - run: nix --version

From d49867b627d002031b52a74428375d92e41a2579 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 20:41:04 -0300
Subject: [PATCH 03/16] Apply matrix strategy

---
 .github/workflows/ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8fa0704..ab853f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -215,9 +215,15 @@ jobs:
   install-with-non-default-inputs:
     name: Install Nix using non-default Action inputs
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        version:
+          - "0.17.0"
+          - "0.18.0"
+          - "0.19.0"
     steps:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
         with:
-          source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.19.0/nix-installer-x86_64-linux
+          source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v${{ matrix.version }}/nix-installer-x86_64-linux
       - run: nix --version

From 5385bea1cb63bb96a60f686dbf596b9776b1e27a Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 20:42:24 -0300
Subject: [PATCH 04/16] Try with somewhat older versions

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab853f9..6d1dd1e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -218,8 +218,8 @@ jobs:
     strategy:
       matrix:
         version:
-          - "0.17.0"
-          - "0.18.0"
+          - "0.12.0"
+          - "0.14.0"
           - "0.19.0"
     steps:
       - uses: actions/checkout@v4

From 0e85ec287f780c95ce2adce15cabee58a42363ee Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 20:49:32 -0300
Subject: [PATCH 05/16] Add expected Nix versions

---
 .github/workflows/ci.yml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d1dd1e..68a1cab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -212,18 +212,25 @@ jobs:
           duration: 5m
           authorized-users: grahamc
 
-  install-with-non-default-inputs:
-    name: Install Nix using non-default Action inputs
+  install-with-non-default-source-url:
+    name: Install Nix using non-default source-url inputs
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        version:
-          - "0.12.0"
-          - "0.14.0"
-          - "0.19.0"
+        versions:
+          - { nix-installer: "0.12.0", nix: "2.20.0" }
+          - { nix-installer: "0.14.0", nix: "2.20.0" }
+          - { nix-installer: "0.18.0", nix: "2.20.0" }
     steps:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
         with:
-          source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v${{ matrix.version }}/nix-installer-x86_64-linux
-      - run: nix --version
+          source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v${{ matrix.versions.nix-installer }}/nix-installer-x86_64-linux
+      - run: |
+          NIX_VERSION_OUTPUT=$(nix --version)
+          NIX_VERSION=$(echo "{NIX_VERSION}" | awk '{print $NF}')
+          EXPECTED_OUTPUT="nix (Nix) ${{ matrix.versions.nix }}"
+          if [ "${NIX_VERSION_OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then
+            echo "Nix version ${NIX_VERSION} didn't match expected version ${{ matrix.versions.nix }}"
+            exit 1
+          fi

From 6265732741cc6d44558fa639993f5ffe9786f88b Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 20:50:21 -0300
Subject: [PATCH 06/16] Fix string interpolation

---
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 68a1cab..30c4967 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -226,9 +226,10 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v${{ matrix.versions.nix-installer }}/nix-installer-x86_64-linux
-      - run: |
+      - name: Compare Nix version with expected version
+        run: |
           NIX_VERSION_OUTPUT=$(nix --version)
-          NIX_VERSION=$(echo "{NIX_VERSION}" | awk '{print $NF}')
+          NIX_VERSION=$(echo "${NIX_VERSION}" | awk '{print $NF}')
           EXPECTED_OUTPUT="nix (Nix) ${{ matrix.versions.nix }}"
           if [ "${NIX_VERSION_OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then
             echo "Nix version ${NIX_VERSION} didn't match expected version ${{ matrix.versions.nix }}"

From 6b0b02c6a24da4a1d9fd921236aff4e6e3fe467c Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 20:51:04 -0300
Subject: [PATCH 07/16] Fix string interpolation (again)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 30c4967..6d4b887 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -229,7 +229,7 @@ jobs:
       - name: Compare Nix version with expected version
         run: |
           NIX_VERSION_OUTPUT=$(nix --version)
-          NIX_VERSION=$(echo "${NIX_VERSION}" | awk '{print $NF}')
+          NIX_VERSION=$(echo "${NIX_VERSION_OUTPUT}" | awk '{print $NF}')
           EXPECTED_OUTPUT="nix (Nix) ${{ matrix.versions.nix }}"
           if [ "${NIX_VERSION_OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then
             echo "Nix version ${NIX_VERSION} didn't match expected version ${{ matrix.versions.nix }}"

From 8d9c69de11344a04730a447b63e6714664f3c7cd Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 20:52:41 -0300
Subject: [PATCH 08/16] Update expected versions

---
 .github/workflows/ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d4b887..4ea79e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -218,8 +218,8 @@ jobs:
     strategy:
       matrix:
         versions:
-          - { nix-installer: "0.12.0", nix: "2.20.0" }
-          - { nix-installer: "0.14.0", nix: "2.20.0" }
+          - { nix-installer: "0.12.0", nix: "2.18.0" }
+          - { nix-installer: "0.14.0", nix: "2.18.1" }
           - { nix-installer: "0.18.0", nix: "2.20.0" }
     steps:
       - uses: actions/checkout@v4
@@ -234,4 +234,6 @@ jobs:
           if [ "${NIX_VERSION_OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then
             echo "Nix version ${NIX_VERSION} didn't match expected version ${{ matrix.versions.nix }}"
             exit 1
+          else
+            echo "Success! Nix version ${NIX_VERSION} installed as expected"
           fi

From 7fcb8420972ee5bc50ed4a7db8eab96b774c261b Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 20:53:46 -0300
Subject: [PATCH 09/16] Undo matrix logic

---
 .github/workflows/ci.yml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ea79e6..64cee77 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -217,23 +217,14 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        versions:
-          - { nix-installer: "0.12.0", nix: "2.18.0" }
-          - { nix-installer: "0.14.0", nix: "2.18.1" }
-          - { nix-installer: "0.18.0", nix: "2.20.0" }
+        version:
+          - "0.12.0"
+          - "0.14.0"
+          - "0.18.0"
     steps:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
         with:
-          source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v${{ matrix.versions.nix-installer }}/nix-installer-x86_64-linux
-      - name: Compare Nix version with expected version
-        run: |
-          NIX_VERSION_OUTPUT=$(nix --version)
-          NIX_VERSION=$(echo "${NIX_VERSION_OUTPUT}" | awk '{print $NF}')
-          EXPECTED_OUTPUT="nix (Nix) ${{ matrix.versions.nix }}"
-          if [ "${NIX_VERSION_OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then
-            echo "Nix version ${NIX_VERSION} didn't match expected version ${{ matrix.versions.nix }}"
-            exit 1
-          else
-            echo "Success! Nix version ${NIX_VERSION} installed as expected"
-          fi
+          source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v${{ matrix.version }}/nix-installer-x86_64-linux
+      - name: Ensure that Nix is installed
+        run: nix --version

From 151fdae2fc3f10fa41e3c9363513977883b23e12 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 21:02:46 -0300
Subject: [PATCH 10/16] Add more test cases

---
 .github/workflows/ci.yml | 46 +++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64cee77..7e2ac57 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -215,16 +215,42 @@ jobs:
   install-with-non-default-source-url:
     name: Install Nix using non-default source-url inputs
     runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        version:
-          - "0.12.0"
-          - "0.14.0"
-          - "0.18.0"
     steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
+      - name: Install with alternative source-url
+        uses: ./.
         with:
-          source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v${{ matrix.version }}/nix-installer-x86_64-linux
-      - name: Ensure that Nix is installed
+          source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux
+      - name: Ensure that Nix is installed via alternative source-url
+        run: nix --version
+
+      - name: Install with alternative source-pr
+        uses: ./.
+        with:
+          # https://github.com/DeterminateSystems/nix-installer/pull/938
+          source-pr: "938"
+      - name: Ensure that Nix is installed via alternative source-pr
+        run: nix --version
+
+      - name: Install with alternative source-revision
+        uses: ./.
+        with:
+          # https://github.com/DeterminateSystems/nix-installer/tree/ccf1d39a83099657ad324e7927676432435431e1
+          source-revision: "ccf1d39a83099657ad324e7927676432435431e1"
+      - name: Ensure that Nix is installed via alternative source-revision
+        run: nix --version
+
+      - name: Install with alternative source-branch
+        uses: ./.
+        with:
+          # https://github.com/DeterminateSystems/nix-installer/tree/lazy-trees
+          source-revision: "lazy-trees"
+      - name: Ensure that Nix is installed via alternative source-branch
+        run: nix --version
+
+      - name: Install with alternative source-tag
+        uses: ./.
+        with:
+          # https://github.com/DeterminateSystems/nix-installer/tree/v0.14.0
+          source-tag: "v0.14.0"
+      - name: Ensure that Nix is installed via alternative source-tag
         run: nix --version

From 86e8caa071bce04a51a78ab8fa6611812b972973 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 21:04:04 -0300
Subject: [PATCH 11/16] Fix path in uses declarations

---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e2ac57..42f5ecc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -217,14 +217,14 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Install with alternative source-url
-        uses: ./.
+        uses: ./
         with:
           source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux
       - name: Ensure that Nix is installed via alternative source-url
         run: nix --version
 
       - name: Install with alternative source-pr
-        uses: ./.
+        uses: ./
         with:
           # https://github.com/DeterminateSystems/nix-installer/pull/938
           source-pr: "938"
@@ -232,7 +232,7 @@ jobs:
         run: nix --version
 
       - name: Install with alternative source-revision
-        uses: ./.
+        uses: ./
         with:
           # https://github.com/DeterminateSystems/nix-installer/tree/ccf1d39a83099657ad324e7927676432435431e1
           source-revision: "ccf1d39a83099657ad324e7927676432435431e1"
@@ -240,7 +240,7 @@ jobs:
         run: nix --version
 
       - name: Install with alternative source-branch
-        uses: ./.
+        uses: ./
         with:
           # https://github.com/DeterminateSystems/nix-installer/tree/lazy-trees
           source-revision: "lazy-trees"
@@ -248,7 +248,7 @@ jobs:
         run: nix --version
 
       - name: Install with alternative source-tag
-        uses: ./.
+        uses: ./
         with:
           # https://github.com/DeterminateSystems/nix-installer/tree/v0.14.0
           source-tag: "v0.14.0"

From 86a97d5eb6b0a8d1b19f10a1f6a7bf6f6f03cd46 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 21:05:48 -0300
Subject: [PATCH 12/16] Add missing checkout action

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 42f5ecc..476d005 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -216,6 +216,8 @@ jobs:
     name: Install Nix using non-default source-url inputs
     runs-on: ubuntu-22.04
     steps:
+      - uses: actions/checkout@v4
+
       - name: Install with alternative source-url
         uses: ./
         with:

From 74f4d105317add960ff1ce903dd6244f9bc9b25d Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 16 May 2024 21:07:06 -0300
Subject: [PATCH 13/16] Fix name of workflow

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 476d005..f64a05b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -212,8 +212,8 @@ jobs:
           duration: 5m
           authorized-users: grahamc
 
-  install-with-non-default-source-url:
-    name: Install Nix using non-default source-url inputs
+  install-with-non-default-source-inputs:
+    name: Install Nix using non-default source-* inputs
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4

From 164c9d00dcc9088c210f402585730424cec085a5 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Fri, 17 May 2024 11:04:45 -0300
Subject: [PATCH 14/16] Check expected Nix versions using script

---
 .editorconfig             | 10 ++++++++++
 .github/verify-version.sh | 13 +++++++++++++
 .github/workflows/ci.yml  | 20 ++++++++++----------
 3 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 .editorconfig
 create mode 100755 .github/verify-version.sh

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a56f2d2
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+# https://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.github/verify-version.sh b/.github/verify-version.sh
new file mode 100755
index 0000000..c3ee0af
--- /dev/null
+++ b/.github/verify-version.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env
+
+EXPECTED_VERSION="${1}"
+
+NIX_VERSION_OUTPUT=$(nix --version)
+NIX_VERSION=$(echo "${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}"
+  exit 1
+else
+  echo "Success! Nix version ${NIX_VERSION} installed as expected"
+fi
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f64a05b..1ffae94 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -222,37 +222,37 @@ jobs:
         uses: ./
         with:
           source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux
-      - name: Ensure that Nix is installed via alternative source-url
-        run: nix --version
+      - name: Ensure that the expected Nix version is installed via alternative source-url
+        run: .github/verify-version.sh 2.18.0
 
       - name: Install with alternative source-pr
         uses: ./
         with:
           # https://github.com/DeterminateSystems/nix-installer/pull/938
           source-pr: "938"
-      - name: Ensure that Nix is installed via alternative source-pr
-        run: nix --version
+      - name: Ensure that the expected Nix version is installed via alternative source-pr
+        run: .github/verify-version.sh 2.21.2
 
       - name: Install with alternative source-revision
         uses: ./
         with:
           # https://github.com/DeterminateSystems/nix-installer/tree/ccf1d39a83099657ad324e7927676432435431e1
           source-revision: "ccf1d39a83099657ad324e7927676432435431e1"
-      - name: Ensure that Nix is installed via alternative source-revision
-        run: nix --version
+      - name: Ensure that the expected Nix version is installed via alternative source-revision
+        run: .github/verify-version.sh 2.21.2
 
       - name: Install with alternative source-branch
         uses: ./
         with:
           # https://github.com/DeterminateSystems/nix-installer/tree/lazy-trees
           source-revision: "lazy-trees"
-      - name: Ensure that Nix is installed via alternative source-branch
-        run: nix --version
+      - name: Ensure that the expected Nix version is installed via alternative source-branch
+        run: .github/verify-version.sh 2.21.2
 
       - name: Install with alternative source-tag
         uses: ./
         with:
           # https://github.com/DeterminateSystems/nix-installer/tree/v0.14.0
           source-tag: "v0.14.0"
-      - name: Ensure that Nix is installed via alternative source-tag
-        run: nix --version
+      - name: Ensure that the expected Nix version is installed via alternative source-tag
+        run: .github/verify-version.sh 2.18.0

From 481524661c3da5addcbf1d31b06ee5a532545baa Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Fri, 17 May 2024 11:10:24 -0300
Subject: [PATCH 15/16] 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

From 350241e13f8c890763c166d3394112406f1cafe0 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Fri, 17 May 2024 11:12:58 -0300
Subject: [PATCH 16/16] Fix expected version

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1ffae94..8307047 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -223,15 +223,15 @@ jobs:
         with:
           source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux
       - name: Ensure that the expected Nix version is installed via alternative source-url
-        run: .github/verify-version.sh 2.18.0
+        run: .github/verify-version.sh 2.21.2
 
       - name: Install with alternative source-pr
         uses: ./
         with:
-          # https://github.com/DeterminateSystems/nix-installer/pull/938
-          source-pr: "938"
+          # https://github.com/DeterminateSystems/nix-installer/pull/665
+          source-pr: "665"
       - name: Ensure that the expected Nix version is installed via alternative source-pr
-        run: .github/verify-version.sh 2.21.2
+        run: .github/verify-version.sh 2.18.0
 
       - name: Install with alternative source-revision
         uses: ./