misc: clean up immediately and avoid delayed defer

hiddeco · haggishunk · commit acef883f50bd · 2023-10-18T08:29:29.000-07:00
Signed-off-by: Hidde Beydals &lt;hidde@hhh.computer&gt;
diff --git a/internal/build/diff.go b/internal/build/diff.go
@@ -116,13 +116,14 @@ func (b *Builder) Diff() (string, bool, error) {
 			if err != nil {
 				return "", createdOrDrifted, err
 			}
-			defer cleanupDir(tmpDir)
 
 			err = diff(liveFile, mergedFile, &output)
 			if err != nil {
+				cleanupDir(tmpDir)
 				return "", createdOrDrifted, err
 			}
 
+			cleanupDir(tmpDir)
 			createdOrDrifted = true
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -116,13 +116,14 @@ func (b *Builder) Diff() (string, bool, error) {`
`116`	`116`	`if err != nil {`
`117`	`117`	`return "", createdOrDrifted, err`
`118`	`118`	`}`
`119`		`- defer cleanupDir(tmpDir)`
`120`	`119`
`121`	`120`	`err = diff(liveFile, mergedFile, &output)`
`122`	`121`	`if err != nil {`
	`122`	`+ cleanupDir(tmpDir)`
`123`	`123`	`return "", createdOrDrifted, err`
`124`	`124`	`}`
`125`	`125`
	`126`	`+ cleanupDir(tmpDir)`
`126`	`127`	`createdOrDrifted = true`
`127`	`128`	`}`
`128`	`129`