From 967151b295fd93e6fe3edfc3578269185855c23c Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Tue, 18 Jul 2017 13:09:36 +0300 Subject: [PATCH] helpers: Add smarter check for asciidoctor --- helpers/content.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/helpers/content.go b/helpers/content.go index 187dd602892..ed6ae33c038 100644 --- a/helpers/content.go +++ b/helpers/content.go @@ -588,12 +588,13 @@ func getAsciidocContent(ctx *RenderingContext) []byte { } jww.INFO.Println("Rendering", ctx.DocumentName, "with", path, "...") - cmd := exec.Command(path, "--no-header-footer", "--safe") + args := []string{"--no-header-footer", "--safe"} if isAsciidoctor { // asciidoctor-specific arg to show stack traces on errors - cmd.Args = append(cmd.Args, "--trace") + args = append(args, "--trace") } - cmd.Args = append(cmd.Args, "-") + args = append(args, "-") + cmd := exec.Command(path, args...) cmd.Stdin = bytes.NewReader(cleanContent) var out, cmderr bytes.Buffer cmd.Stdout = &out @@ -692,7 +693,7 @@ func getRstContent(ctx *RenderingContext) []byte { } } - return result[bodyStart+7: bodyEnd] + return result[bodyStart+7 : bodyEnd] } func orgRender(ctx *RenderingContext, c ContentSpec) []byte {