Merge pull request #804 from twpayne/allow-funcs-in-chezmoitemplates

Allow all functions in .chezmoitemplates
twpayne · Jun 25, 2020 · 2c97ca0 · 2c97ca0
2 parents 2e2f815 + b611aea
commit 2c97ca0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/internal/chezmoi/targetstate.go b/internal/chezmoi/targetstate.go
@@ -752,7 +752,7 @@ func (ts *TargetState) addTemplatesDir(fs vfs.FS, path string) error {
 				return err
 			}
 			name := strings.TrimPrefix(filepath.ToSlash(path), prefix)
-			tmpl, err := template.New(name).Parse(string(contents))
+			tmpl, err := template.New(name).Option(ts.TemplateOptions...).Funcs(ts.TemplateFuncs).Parse(string(contents))
 			if err != nil {
 				return err
 			}

diff --git a/internal/chezmoi/targetstate_test.go b/internal/chezmoi/targetstate_test.go
@@ -467,7 +467,7 @@ func TestTargetStatePopulate(t *testing.T) {
 				WithDestDir("/"),
 				WithSourceDir("/"),
 				WithTemplates(map[string]*template.Template{
-					"foo": template.Must(template.New("foo").Parse("bar")),
+					"foo": template.Must(template.New("foo").Option("missingkey=error").Parse("bar")),
 				}),
 			),
 		},

diff --git a/testdata/scripts/executetemplate.txt b/testdata/scripts/executetemplate.txt
@@ -2,7 +2,7 @@ chezmoi execute-template '{{ "output" }}'
 stdout output
 
 chezmoi execute-template '{{ template "partial" }}'
-stdout partial-output
+stdout 'hello world'
 
 -- home/user/.local/share/chezmoi/.chezmoitemplates/partial --
-partial-output
+{{ cat "hello" "world" }}