[eval symlinks] eval symlinks in print-dev-env (#1777)

savil · web-flow · commit b3903520a71a · 2024-02-04T13:10:07.000-08:00
diff --git a/internal/nix/nix.go b/internal/nix/nix.go
@@ -64,11 +64,16 @@ func (*Nix) PrintDevEnv(ctx context.Context, args *PrintDevEnvArgs) (*PrintDevEn
 		}
 	}
 
+	flakeDirResolved, err := filepath.EvalSymlinks(args.FlakeDir)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
 	if len(data) == 0 {
 		cmd := exec.CommandContext(
 			ctx,
 			"nix", "print-dev-env",
-			args.FlakeDir,
+			"path:"+flakeDirResolved,
 		)
 		cmd.Args = append(cmd.Args, ExperimentalFlags()...)
 		cmd.Args = append(cmd.Args, "--json")

Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,16 @@ func (Nix) PrintDevEnv(ctx context.Context, args PrintDevEnvArgs) (*PrintDevEn`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ flakeDirResolved, err := filepath.EvalSymlinks(args.FlakeDir)`
	`68`	`+ if err != nil {`
	`69`	`+ return nil, errors.WithStack(err)`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`if len(data) == 0 {`
`68`	`73`	`cmd := exec.CommandContext(`
`69`	`74`	`ctx,`
`70`	`75`	`"nix", "print-dev-env",`
`71`		`- args.FlakeDir,`
	`76`	`+ "path:"+flakeDirResolved,`
`72`	`77`	`)`
`73`	`78`	`cmd.Args = append(cmd.Args, ExperimentalFlags()...)`
`74`	`79`	`cmd.Args = append(cmd.Args, "--json")`