From 6fc8f04ecb3241c39a10988d358cdcd226de5ac9 Mon Sep 17 00:00:00 2001
From: Farid Zakaria <farid.m.zakaria@gmail.com>
Date: Thu, 25 Sep 2025 13:26:53 -0700
Subject: [PATCH] shellcheck fix: tests/functional/flakes/flakes.sh

---
 maintainers/flake-module.nix      |  1 -
 tests/functional/flakes/flakes.sh | 90 ++++++++++++++++---------------
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index 024565116..50601e06f 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -106,7 +106,6 @@
             enable = true;
             excludes = [
               # We haven't linted these files yet
-              ''^tests/functional/flakes/flakes\.sh$''
               ''^tests/functional/flakes/follow-paths\.sh$''
               ''^tests/functional/flakes/prefetch\.sh$''
               ''^tests/functional/flakes/run\.sh$''
diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
index 97d238654..5b1da0f02 100755
--- a/tests/functional/flakes/flakes.sh
+++ b/tests/functional/flakes/flakes.sh
@@ -7,7 +7,7 @@ TODO_NixOS
 requireGit
 
 clearStore
-rm -rf $TEST_HOME/.cache $TEST_HOME/.config
+rm -rf "$TEST_HOME"/.cache "$TEST_HOME"/.config
 
 createFlake1
 createFlake2
@@ -59,7 +59,7 @@ nix flake metadata flake1
 nix flake metadata flake1 | grepQuiet 'Locked URL:.*flake1.*'
 
 # Test 'nix flake metadata' on a chroot store.
-nix flake metadata --store $TEST_ROOT/chroot-store flake1
+nix flake metadata --store "$TEST_ROOT"/chroot-store flake1
 
 # Test 'nix flake metadata' on a local flake.
 (cd "$flake1Dir" && nix flake metadata) | grepQuiet 'URL:.*flake1.*'
@@ -75,17 +75,18 @@ hash1=$(echo "$json" | jq -r .revision)
 [[ -n $(echo "$json" | jq -r .fingerprint) ]]
 
 echo foo > "$flake1Dir/foo"
-git -C "$flake1Dir" add $flake1Dir/foo
+git -C "$flake1Dir" add "$flake1Dir"/foo
 [[ $(nix flake metadata flake1 --json --refresh | jq -r .dirtyRevision) == "$hash1-dirty" ]]
 [[ "$(nix flake metadata flake1 --json | jq -r .fingerprint)" != null ]]
 
 echo -n '# foo' >> "$flake1Dir/flake.nix"
 flake1OriginalCommit=$(git -C "$flake1Dir" rev-parse HEAD)
 git -C "$flake1Dir" commit -a -m 'Foo'
+# shellcheck disable=SC2034
 flake1NewCommit=$(git -C "$flake1Dir" rev-parse HEAD)
 hash2=$(nix flake metadata flake1 --json --refresh | jq -r .revision)
 [[ $(nix flake metadata flake1 --json --refresh | jq -r .dirtyRevision) == "null" ]]
-[[ $hash1 != $hash2 ]]
+[[ $hash1 != "$hash2" ]]
 
 # Test 'nix build' on a flake.
 nix build -o "$TEST_ROOT/result" flake1#foo
@@ -204,8 +205,8 @@ git -C "$flake3Dir" add flake.nix
 git -C "$flake3Dir" commit -m 'Update flake.nix'
 
 # Check whether `nix build` works with an incomplete lockfile
-nix build -o $TEST_ROOT/result "$flake3Dir#sth sth"
-nix build -o $TEST_ROOT/result "$flake3Dir#sth%20sth"
+nix build -o "$TEST_ROOT"/result "$flake3Dir#sth sth"
+nix build -o "$TEST_ROOT"/result "$flake3Dir#sth%20sth"
 
 # Check whether it saved the lockfile
 [[ -n $(git -C "$flake3Dir" diff master) ]]
@@ -249,7 +250,7 @@ nix flake lock "$flake3Dir"
 [[ -z $(git -C "$flake3Dir" diff master || echo failed) ]]
 
 nix flake update --flake "$flake3Dir" --override-flake flake2 nixpkgs
-[[ ! -z $(git -C "$flake3Dir" diff master || echo failed) ]]
+[[ -n $(git -C "$flake3Dir" diff master || echo failed) ]]
 
 # Testing the nix CLI
 nix registry add flake1 flake3
@@ -262,7 +263,7 @@ nix registry remove flake1
 [[ $(nix registry list | wc -l) == 4 ]]
 
 # Test 'nix registry list' with a disabled global registry.
-nix registry add user-flake1 git+file://$flake1Dir
+nix registry add user-flake1 git+file://"$flake1Dir"
 nix registry add user-flake2 "git+file://$percentEncodedFlake2Dir"
 [[ $(nix --flake-registry "" registry list | wc -l) == 2 ]]
 nix --flake-registry "" registry list | grepQuietInverse '^global' # nothing in global registry
@@ -273,9 +274,9 @@ nix registry remove user-flake2
 [[ $(nix registry list | wc -l) == 4 ]]
 
 # Test 'nix flake clone'.
-rm -rf $TEST_ROOT/flake1-v2
-nix flake clone flake1 --dest $TEST_ROOT/flake1-v2
-[ -e $TEST_ROOT/flake1-v2/flake.nix ]
+rm -rf "$TEST_ROOT"/flake1-v2
+nix flake clone flake1 --dest "$TEST_ROOT"/flake1-v2
+[ -e "$TEST_ROOT"/flake1-v2/flake.nix ]
 
 # Test 'follows' inputs.
 cat > "$flake3Dir/flake.nix" <<EOF
@@ -319,9 +320,9 @@ nix flake lock "$flake3Dir"
 [[ $(jq -c .nodes.root.inputs.bar "$flake3Dir/flake.lock") = '["flake2"]' ]]
 
 # Test overriding inputs of inputs.
-writeTrivialFlake $flake7Dir
-git -C $flake7Dir add flake.nix
-git -C $flake7Dir commit -m 'Initial'
+writeTrivialFlake "$flake7Dir"
+git -C "$flake7Dir" add flake.nix
+git -C "$flake7Dir" commit -m 'Initial'
 
 cat > "$flake3Dir/flake.nix" <<EOF
 {
@@ -349,54 +350,55 @@ cat > "$flake3Dir/flake.nix" <<EOF
 EOF
 
 nix flake update --flake "$flake3Dir"
+# shellcheck disable=SC2076
 [[ $(jq -c .nodes.flake2.inputs.flake1 "$flake3Dir/flake.lock") =~ '["foo"]' ]]
 [[ $(jq .nodes.foo.locked.url "$flake3Dir/flake.lock") =~ flake7 ]]
 
 # Test git+file with bare repo.
-rm -rf $flakeGitBare
-git clone --bare $flake1Dir $flakeGitBare
-nix build -o $TEST_ROOT/result git+file://$flakeGitBare
+rm -rf "$flakeGitBare"
+git clone --bare "$flake1Dir" "$flakeGitBare"
+nix build -o "$TEST_ROOT"/result git+file://"$flakeGitBare"
 
 # Test path flakes.
-mkdir -p $flake5Dir
-writeDependentFlake $flake5Dir
-nix flake lock path://$flake5Dir
+mkdir -p "$flake5Dir"
+writeDependentFlake "$flake5Dir"
+nix flake lock path://"$flake5Dir"
 
 # Test tarball flakes.
-tar cfz $TEST_ROOT/flake.tar.gz -C $TEST_ROOT flake5
+tar cfz "$TEST_ROOT"/flake.tar.gz -C "$TEST_ROOT" flake5
 
-nix build -o $TEST_ROOT/result file://$TEST_ROOT/flake.tar.gz
+nix build -o "$TEST_ROOT"/result file://"$TEST_ROOT"/flake.tar.gz
 
 # Building with a tarball URL containing a SRI hash should also work.
-url=$(nix flake metadata --json file://$TEST_ROOT/flake.tar.gz | jq -r .url)
+url=$(nix flake metadata --json file://"$TEST_ROOT"/flake.tar.gz | jq -r .url)
 [[ $url =~ sha256- ]]
 
-nix build -o $TEST_ROOT/result $url
+nix build -o "$TEST_ROOT"/result "$url"
 
 # Building with an incorrect SRI hash should fail.
-expectStderr 102 nix build -o $TEST_ROOT/result "file://$TEST_ROOT/flake.tar.gz?narHash=sha256-qQ2Zz4DNHViCUrp6gTS7EE4+RMqFQtUfWF2UNUtJKS0=" | grep 'NAR hash mismatch'
+expectStderr 102 nix build -o "$TEST_ROOT"/result "file://$TEST_ROOT/flake.tar.gz?narHash=sha256-qQ2Zz4DNHViCUrp6gTS7EE4+RMqFQtUfWF2UNUtJKS0=" | grep 'NAR hash mismatch'
 
 # Test --override-input.
 git -C "$flake3Dir" reset --hard
-nix flake lock "$flake3Dir" --override-input flake2/flake1 file://$TEST_ROOT/flake.tar.gz -vvvvv
+nix flake lock "$flake3Dir" --override-input flake2/flake1 file://"$TEST_ROOT"/flake.tar.gz -vvvvv
 [[ $(jq .nodes.flake1_2.locked.url "$flake3Dir/flake.lock") =~ flake.tar.gz ]]
 
 nix flake lock "$flake3Dir" --override-input flake2/flake1 flake1
 [[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]]
 
-nix flake lock "$flake3Dir" --override-input flake2/flake1 flake1/master/$hash1
+nix flake lock "$flake3Dir" --override-input flake2/flake1 flake1/master/"$hash1"
 [[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash1 ]]
 
 # Test --update-input.
 nix flake lock "$flake3Dir"
-[[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") = $hash1 ]]
+[[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") = "$hash1" ]]
 
 nix flake update flake2/flake1 --flake "$flake3Dir"
 [[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]]
 
 # Test updating multiple inputs.
-nix flake lock "$flake3Dir" --override-input flake1 flake1/master/$hash1
-nix flake lock "$flake3Dir" --override-input flake2/flake1 flake1/master/$hash1
+nix flake lock "$flake3Dir" --override-input flake1 flake1/master/"$hash1"
+nix flake lock "$flake3Dir" --override-input flake2/flake1 flake1/master/"$hash1"
 [[ $(jq -r .nodes.flake1.locked.rev "$flake3Dir/flake.lock") =~ $hash1 ]]
 [[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash1 ]]
 
@@ -409,13 +411,13 @@ nix flake metadata "$flake3Dir" --json | jq .
 nix flake metadata "$flake3Dir" --json --eval-store "dummy://?read-only=false" | jq .
 
 # Test flake in store does not evaluate.
-rm -rf $badFlakeDir
-mkdir $badFlakeDir
-echo INVALID > $badFlakeDir/flake.nix
-nix store delete $(nix store add-path $badFlakeDir)
+rm -rf "$badFlakeDir"
+mkdir "$badFlakeDir"
+echo INVALID > "$badFlakeDir"/flake.nix
+nix store delete "$(nix store add-path "$badFlakeDir")"
 
-[[ $(nix path-info      $(nix store add-path $flake1Dir)) =~ flake1 ]]
-[[ $(nix path-info path:$(nix store add-path $flake1Dir)) =~ simple ]]
+[[ $(nix path-info      "$(nix store add-path "$flake1Dir")") =~ flake1 ]]
+[[ $(nix path-info path:"$(nix store add-path "$flake1Dir")") =~ simple ]]
 
 # Test fetching flakerefs in the legacy CLI.
 [[ $(nix-instantiate --eval flake:flake3 -A x) = 123 ]]
@@ -424,15 +426,15 @@ nix store delete $(nix store add-path $badFlakeDir)
 [[ $(NIX_PATH=flake3=flake:flake3 nix-instantiate --eval '<flake3>' -A x) = 123 ]]
 
 # Test alternate lockfile paths.
-nix flake lock "$flake2Dir" --output-lock-file $TEST_ROOT/flake2.lock
-cmp "$flake2Dir/flake.lock" $TEST_ROOT/flake2.lock >/dev/null # lockfiles should be identical, since we're referencing flake2's original one
+nix flake lock "$flake2Dir" --output-lock-file "$TEST_ROOT"/flake2.lock
+cmp "$flake2Dir/flake.lock" "$TEST_ROOT"/flake2.lock >/dev/null # lockfiles should be identical, since we're referencing flake2's original one
 
-nix flake lock "$flake2Dir" --output-lock-file $TEST_ROOT/flake2-overridden.lock --override-input flake1 git+file://$flake1Dir?rev=$flake1OriginalCommit
-expectStderr 1 cmp "$flake2Dir/flake.lock" $TEST_ROOT/flake2-overridden.lock
-nix flake metadata "$flake2Dir" --reference-lock-file $TEST_ROOT/flake2-overridden.lock | grepQuiet $flake1OriginalCommit
+nix flake lock "$flake2Dir" --output-lock-file "$TEST_ROOT"/flake2-overridden.lock --override-input flake1 git+file://"$flake1Dir"?rev="$flake1OriginalCommit"
+expectStderr 1 cmp "$flake2Dir/flake.lock" "$TEST_ROOT"/flake2-overridden.lock
+nix flake metadata "$flake2Dir" --reference-lock-file "$TEST_ROOT"/flake2-overridden.lock | grepQuiet "$flake1OriginalCommit"
 
 # reference-lock-file can only be used if allow-dirty is set.
-expectStderr 1 nix flake metadata "$flake2Dir" --no-allow-dirty --reference-lock-file $TEST_ROOT/flake2-overridden.lock
+expectStderr 1 nix flake metadata "$flake2Dir" --no-allow-dirty --reference-lock-file "$TEST_ROOT"/flake2-overridden.lock
 
 # After changing an input (flake2 from newFlake2Rev to prevFlake2Rev), we should have the transitive inputs locked by revision $prevFlake2Rev of flake2.
 prevFlake1Rev=$(nix flake metadata --json "$flake1Dir" | jq -r .revision)
@@ -459,7 +461,7 @@ git -C "$flake3Dir" commit flake.nix -m 'bla'
 
 rm "$flake3Dir/flake.lock"
 nix flake lock "$flake3Dir"
-[[ "$(nix flake metadata --json "$flake3Dir" | jq -r .locks.nodes.flake1.locked.rev)" = $newFlake1Rev ]]
+[[ "$(nix flake metadata --json "$flake3Dir" | jq -r .locks.nodes.flake1.locked.rev)" = "$newFlake1Rev" ]]
 
 cat > "$flake3Dir/flake.nix" <<EOF
 {
@@ -470,7 +472,7 @@ cat > "$flake3Dir/flake.nix" <<EOF
 }
 EOF
 
-[[ "$(nix flake metadata --json "$flake3Dir" | jq -r .locks.nodes.flake1.locked.rev)" = $prevFlake1Rev ]]
+[[ "$(nix flake metadata --json "$flake3Dir" | jq -r .locks.nodes.flake1.locked.rev)" = "$prevFlake1Rev" ]]
 
 baseDir=$TEST_ROOT/$RANDOM
 subdirFlakeDir1=$baseDir/foo1