From f8e351cd945f4ae444b57c3917b3648af3b0c709 Mon Sep 17 00:00:00 2001
From: Farid Zakaria <farid.m.zakaria@gmail.com>
Date: Thu, 25 Sep 2025 13:16:47 -0700
Subject: [PATCH] shellcheck fix: tests/functional/fixed

---
 maintainers/flake-module.nix       |  3 ---
 tests/functional/fixed.builder1.sh |  4 +++-
 tests/functional/fixed.builder2.sh | 13 ++++++++-----
 tests/functional/fixed.sh          | 20 ++++++++++----------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index 3470f853f..0742d2a6a 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -106,9 +106,6 @@
             enable = true;
             excludes = [
               # We haven't linted these files yet
-              ''^tests/functional/fixed\.builder1\.sh$''
-              ''^tests/functional/fixed\.builder2\.sh$''
-              ''^tests/functional/fixed\.sh$''
               ''^tests/functional/flakes/absolute-paths\.sh$''
               ''^tests/functional/flakes/check\.sh$''
               ''^tests/functional/flakes/config\.sh$''
diff --git a/tests/functional/fixed.builder1.sh b/tests/functional/fixed.builder1.sh
index c41bb2b9a..172f65e6b 100644
--- a/tests/functional/fixed.builder1.sh
+++ b/tests/functional/fixed.builder1.sh
@@ -1,3 +1,5 @@
+# shellcheck shell=bash
 if test "$IMPURE_VAR1" != "foo"; then exit 1; fi
 if test "$IMPURE_VAR2" != "bar"; then exit 1; fi
-echo "Hello World!" > $out
+# shellcheck disable=SC2154
+echo "Hello World!" > "$out"
diff --git a/tests/functional/fixed.builder2.sh b/tests/functional/fixed.builder2.sh
index 31ea1579a..9fbcf022e 100644
--- a/tests/functional/fixed.builder2.sh
+++ b/tests/functional/fixed.builder2.sh
@@ -1,6 +1,9 @@
-echo dummy: $dummy
+# shellcheck shell=bash
+# shellcheck disable=SC2154
+echo dummy: "$dummy"
 if test -n "$dummy"; then sleep 2; fi
-mkdir $out
-mkdir $out/bla
-echo "Hello World!" > $out/foo
-ln -s foo $out/bar
+# shellcheck disable=SC2154
+mkdir "$out"
+mkdir "$out"/bla
+echo "Hello World!" > "$out"/foo
+ln -s foo "$out"/bar
diff --git a/tests/functional/fixed.sh b/tests/functional/fixed.sh
index d98769e64..edf6f88d4 100755
--- a/tests/functional/fixed.sh
+++ b/tests/functional/fixed.sh
@@ -6,7 +6,7 @@ TODO_NixOS
 
 clearStore
 
-path=$(nix-store -q $(nix-instantiate fixed.nix -A good.0))
+path=$(nix-store -q "$(nix-instantiate fixed.nix -A good.0)")
 
 echo 'testing bad...'
 nix-build fixed.nix -A bad --no-out-link && fail "should fail"
@@ -14,7 +14,7 @@ nix-build fixed.nix -A bad --no-out-link && fail "should fail"
 # Building with the bad hash should produce the "good" output path as
 # a side-effect.
 [[ -e $path ]]
-nix path-info --json $path | grep fixed:md5:2qk15sxzzjlnpjk9brn7j8ppcd
+nix path-info --json "$path" | grep fixed:md5:2qk15sxzzjlnpjk9brn7j8ppcd
 
 echo 'testing good...'
 nix-build fixed.nix -A good --no-out-link
@@ -37,7 +37,7 @@ fi
 
 # While we're at it, check attribute selection a bit more.
 echo 'testing attribute selection...'
-test $(nix-instantiate fixed.nix -A good.1 | wc -l) = 1
+test "$(nix-instantiate fixed.nix -A good.1 | wc -l)" = 1
 
 # Test parallel builds of derivations that produce the same output.
 # Only one should run at the same time.
@@ -51,16 +51,16 @@ echo 'testing sameAsAdd...'
 out=$(nix-build fixed.nix -A sameAsAdd --no-out-link)
 
 # This is what fixed.builder2 produces...
-rm -rf $TEST_ROOT/fixed
-mkdir $TEST_ROOT/fixed
-mkdir $TEST_ROOT/fixed/bla
-echo "Hello World!" > $TEST_ROOT/fixed/foo
-ln -s foo $TEST_ROOT/fixed/bar
+rm -rf "$TEST_ROOT"/fixed
+mkdir "$TEST_ROOT"/fixed
+mkdir "$TEST_ROOT"/fixed/bla
+echo "Hello World!" > "$TEST_ROOT"/fixed/foo
+ln -s foo "$TEST_ROOT"/fixed/bar
 
-out2=$(nix-store --add $TEST_ROOT/fixed)
+out2=$(nix-store --add "$TEST_ROOT"/fixed)
 [ "$out" = "$out2" ]
 
-out3=$(nix-store --add-fixed --recursive sha256 $TEST_ROOT/fixed)
+out3=$(nix-store --add-fixed --recursive sha256 "$TEST_ROOT"/fixed)
 [ "$out" = "$out3" ]
 
 out4=$(nix-store --print-fixed-path --recursive sha256 "1ixr6yd3297ciyp9im522dfxpqbkhcw0pylkb2aab915278fqaik" fixed)