Remove control patchfile after revert

dpanic · Jul 17, 2021 · 4ed0f4a · 4ed0f4a
1 parent 43a5815
commit 4ed0f4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/generator/generator.go b/generator/generator.go
@@ -64,6 +64,7 @@ func Close() {
 	}
 
 	if fdRevert != nil {
+		fdRevert.WriteString(fmt.Sprintf("rm -rf %s\n", patchFilesControlFile))
 		fdRevert.Sync()
 		fdRevert.Close()
 	}

diff --git a/generator/patch.go b/generator/patch.go
@@ -60,18 +60,21 @@ func writePatch(p *parser.Result, environment string, log *zap.Logger) (err erro
 	bodyCommented = strings.Trim(bodyCommented, "\n")
 
 	// generate payload
-	p.Patch.Body = fmt.Sprintf("\n%s PATCHFILES START\n%s\n%s PATCHFILES END\n", p.Patch.CommentCharacter, p.Patch.Body, p.Patch.CommentCharacter)
-	payload := base64.StdEncoding.EncodeToString([]byte(p.Patch.Body))
+	if p.Patch.Mode == "append" {
+		p.Patch.Body = fmt.Sprintf("\n%s PATCHFILES START\n%s\n%s PATCHFILES END\n", p.Patch.CommentCharacter, p.Patch.Body, p.Patch.CommentCharacter)
+	}
+	payload := base64.StdEncoding.EncodeToString([]byte(p.Patch.Body + "\n"))
 
 	// write mode
+	commandsAfter := p.Patch.CommandsAfter
 	writeMode := ">"
 	if p.Patch.Mode == "append" {
 		writeMode = ">>"
+	} else {
+		command := fmt.Sprintf("cp -r %s %s.oldpatchfile", p.Patch.Output, p.Patch.Output)
+		commandsAfter = append(commandsAfter, command)
 	}
 
-	commandsAfter := p.Patch.CommandsAfter
-	command := fmt.Sprintf("cp -r %s %s.oldpatchfile", p.Patch.Output, p.Patch.Output)
-	commandsAfter = append(commandsAfter, command)
 	var (
 		buf = new(bytes.Buffer)
 	)