fix: Respect config file umask setting when creating entries

lukekarrys · Dec 4, 2022 · feab4e7 · feab4e7
1 parent 725d427
commit feab4e7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/pkg/chezmoi/sourcestate.go b/pkg/chezmoi/sourcestate.go
@@ -225,6 +225,13 @@ func WithTemplateOptions(templateOptions []string) SourceStateOption {
 	}
 }
 
+// WithUmask sets the umask.
+func WithUmask(umask fs.FileMode) SourceStateOption {
+	return func(s *SourceState) {
+		s.umask = umask
+	}
+}
+
 // WithVersion sets the version.
 func WithVersion(version semver.Version) SourceStateOption {
 	return func(s *SourceState) {

diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
@@ -1500,6 +1500,7 @@ func (c *Config) newSourceState(
 		chezmoi.WithSystem(c.sourceSystem),
 		chezmoi.WithTemplateFuncs(c.templateFuncs),
 		chezmoi.WithTemplateOptions(c.Template.Options),
+		chezmoi.WithUmask(c.Umask),
 		chezmoi.WithVersion(c.version),
 	}, options...)...)
 

diff --git a/pkg/cmd/testdata/scripts/issue2609.txtar b/pkg/cmd/testdata/scripts/issue2609.txtar
@@ -0,0 +1,10 @@
+[windows] skip 'UNIX only'
+
+# test that chezmoi apply uses the umask from the configuration file
+exec chezmoi apply
+cmpmod 600 $HOME/.file
+
+-- home/user/.config/chezmoi/chezmoi.yaml --
+umask: 0o077
+-- home/user/.local/share/chezmoi/dot_file --
+# contents of .file