fix: Respect .chezmoiroot in source-path command with no arguments

twpayne · Sep 23, 2022 · 9dda54a · 9dda54a
1 parent ab36549
commit 9dda54a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pkg/cmd/sourcepathcmd.go b/pkg/cmd/sourcepathcmd.go
@@ -22,7 +22,11 @@ func (c *Config) newSourcePathCmd() *cobra.Command {
 
 func (c *Config) runSourcePathCmd(cmd *cobra.Command, args []string) error {
 	if len(args) == 0 {
-		return c.writeOutputString(c.SourceDirAbsPath.String() + "\n")
+		sourceDirAbsPath, err := c.sourceDirAbsPath()
+		if err != nil {
+			return err
+		}
+		return c.writeOutputString(sourceDirAbsPath.String() + "\n")
 	}
 
 	sourceState, err := c.newSourceState(cmd.Context())

diff --git a/pkg/cmd/testdata/scripts/issue2380.txt b/pkg/cmd/testdata/scripts/issue2380.txt
@@ -0,0 +1,6 @@
+# test that chezmoi source-path with no arguments respects .chezmoiroot
+exec chezmoi source-path
+stdout ${CHEZMOISOURCEDIR@R}/home
+
+-- home/user/.local/share/chezmoi/.chezmoiroot --
+home