fix: Correct capitalization of .chezmoi.config template variables

twpayne · Apr 21, 2023 · fe6010e · fe6010e
1 parent ed0c798
commit fe6010e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
@@ -237,7 +237,7 @@ type templateData struct {
 	args           []string
 	cacheDir       chezmoi.AbsPath
 	command        string
-	config         ConfigFile
+	config         map[string]any
 	configFile     chezmoi.AbsPath
 	executable     chezmoi.AbsPath
 	fqdnHostname   string
@@ -2084,7 +2084,7 @@ func (c *Config) newTemplateData(cmd *cobra.Command) *templateData {
 		args:         os.Args,
 		cacheDir:     c.CacheDirAbsPath,
 		command:      cmd.Name(),
-		config:       c.ConfigFile,
+		config:       c.ConfigFile.toMap(),
 		configFile:   c.configFileAbsPath,
 		executable:   chezmoi.NewAbsPath(executable),
 		fqdnHostname: fqdnHostname,
@@ -2533,6 +2533,14 @@ func newConfigFile(bds *xdg.BaseDirectorySpecification) ConfigFile {
 	}
 }
 
+func (f *ConfigFile) toMap() map[string]any {
+	var result map[string]any
+	if err := mapstructure.Decode(f, &result); err != nil {
+		panic(err)
+	}
+	return result
+}
+
 func parseCommand(command string, args []string) (string, []string, error) {
 	// If command is found, then return it.
 	if path, err := chezmoi.LookPath(command); err == nil {

diff --git a/pkg/cmd/testdata/scripts/issue2942.txtar b/pkg/cmd/testdata/scripts/issue2942.txtar
@@ -0,0 +1,3 @@
+# test that .chezmoi.config variables are capitalized correctly
+exec chezmoi execute-template '{{ .chezmoi.config.keepassxc.command }}'
+stdout '^keepassxc-cli$'