From 137ba71f02366e138e8a130f1bfd3be687aaa6b0 Mon Sep 17 00:00:00 2001
From: silvanshade <silvanshade@users.noreply.github.com>
Date: Mon, 3 Feb 2025 17:47:37 -0700
Subject: [PATCH 1/2] Fix shellcheck lints

---
 tests/functional/flakes/symlink-paths.sh | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/functional/flakes/symlink-paths.sh b/tests/functional/flakes/symlink-paths.sh
index 2559e81073a..8f3dafd2952 100644
--- a/tests/functional/flakes/symlink-paths.sh
+++ b/tests/functional/flakes/symlink-paths.sh
@@ -6,14 +6,14 @@ requireGit
 
 create_flake() {
     local flakeDir="$1"
-    createGitRepo $flakeDir
-    cat > $flakeDir/flake.nix <<EOF
+    createGitRepo "$flakeDir"
+    cat > "$flakeDir/flake.nix" <<EOF
 {
     outputs = { self }: { x = 2; };
 }
 EOF
-    git -C $flakeDir add flake.nix
-    git -C $flakeDir commit -m Initial
+    git -C "$flakeDir" add flake.nix
+    git -C "$flakeDir" commit -m Initial
 }
 
 test_symlink_points_to_flake() {
@@ -34,15 +34,15 @@ test_symlink_points_to_flake_in_subdir
 
 test_symlink_points_to_dir_in_repo() {
     local repoDir="$TEST_ROOT/flake1"
-    createGitRepo $repoDir
+    createGitRepo "$repoDir"
     mkdir -p "$repoDir/subdir"
-    cat > $repoDir/subdir/flake.nix <<EOF
+    cat > "$repoDir/subdir/flake.nix" <<EOF
 {
     outputs = { self }: { x = 2; };
 }
 EOF
-    git -C $repoDir add subdir/flake.nix
-    git -C $repoDir commit -m Initial
+    git -C "$repoDir" add subdir/flake.nix
+    git -C "$repoDir" commit -m Initial
     ln -sn "$TEST_ROOT/flake1/subdir" "$TEST_ROOT/flake1_sym"
     [[ $(nix eval "$TEST_ROOT/flake1_sym#x") = 2 ]]
     rm -rf "$TEST_ROOT/flake1" "$TEST_ROOT/flake1_sym"
@@ -51,22 +51,22 @@ test_symlink_points_to_dir_in_repo
 
 test_symlink_from_repo_to_another() {
     local repoDir="$TEST_ROOT/repo1"
-    createGitRepo $repoDir
-    echo "Hello" > $repoDir/file
-    mkdir $repoDir/subdir
-    cat > $repoDir/subdir/flake.nix <<EOF
+    createGitRepo "{$repoDir}"
+    echo "Hello" > "$repoDir/file"
+    mkdir "$repoDir/subdir"
+    cat > "$repoDir/subdir/flake.nix" <<EOF
 {
     outputs = { self }: { x = builtins.readFile ../file; };
 }
 EOF
-    git -C $repoDir add subdir/flake.nix file
-    git -C $repoDir commit -m Initial
+    git -C "$repoDir" add subdir/flake.nix file
+    git -C "$repoDir" commit -m Initial
     [[ $(nix eval "$TEST_ROOT/repo1/subdir#x") == \"Hello\\n\" ]]
 
     local repo2Dir="$TEST_ROOT/repo2"
-    createGitRepo $repo2Dir
+    createGitRepo "$repo2Dir"
     ln -sn "$repoDir/subdir" "$repo2Dir/flake1_sym"
-    echo "World" > $repo2Dir/file
+    echo "World" > "$repo2Dir/file"
     git -C "$repo2Dir" add flake1_sym file
     git -C "$repo2Dir" commit -m Initial
     [[ $(nix eval "$repo2Dir/flake1_sym#x") == \"Hello\\n\" ]]

From f90ba3a7c1304c067581100cfad10d18f2fcb72c Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Tue, 4 Feb 2025 11:25:14 -0500
Subject: [PATCH 2/2] Update tests/functional/flakes/symlink-paths.sh

---
 tests/functional/flakes/symlink-paths.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/flakes/symlink-paths.sh b/tests/functional/flakes/symlink-paths.sh
index 8f3dafd2952..d93accc5405 100644
--- a/tests/functional/flakes/symlink-paths.sh
+++ b/tests/functional/flakes/symlink-paths.sh
@@ -51,7 +51,7 @@ test_symlink_points_to_dir_in_repo
 
 test_symlink_from_repo_to_another() {
     local repoDir="$TEST_ROOT/repo1"
-    createGitRepo "{$repoDir}"
+    createGitRepo "$repoDir"
     echo "Hello" > "$repoDir/file"
     mkdir "$repoDir/subdir"
     cat > "$repoDir/subdir/flake.nix" <<EOF