Merge pull request #841 from hairyhenderson/chmod-out-first

Apply --chmod before opening output file

1 files changed, 6 insertions, 3 deletions

diff --git a/template.go b/template.go
index 37e0c721..3559b5ca 100644
--- a/template.go
+++ b/template.go
@@ -243,13 +243,16 @@ func openOutFile(cfg *config.Config, filename string, mode os.FileMode, modeOver
 }
 
 func createOutFile(filename string, mode os.FileMode, modeOverride bool) (out io.WriteCloser, err error) {
+	if modeOverride {
+		err = fs.Chmod(filename, mode.Perm())
+		if err != nil && !os.IsNotExist(err) {
+			return nil, fmt.Errorf("failed to chmod output file '%s' with mode %q: %w", filename, mode.Perm(), err)
+		}
+	}
 	out, err = fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, mode.Perm())
 	if err != nil {
 		return out, err
 	}
-	if modeOverride {
-		err = fs.Chmod(filename, mode.Perm())
-	}
 	return out, err
 }