danog/gojekyll
1
0
Fork 0
mirror of https://github.com/danog/gojekyll.git synced 2025-01-22 21:01:18 +01:00
Code Issues Projects Releases Wiki Activity

Update code that recognizes missing pymentize to modern golang; add solution message

Browse Source
This commit is contained in:
Oliver Steele 2021-06-18 14:49:52 +08:00
parent 1cded6031f
commit 831ea531a1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tags/highlight.go
View File

@ -4,8 +4,10 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"html" "html"
"io/fs"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"regexp" "regexp"
"strings" "strings"
@ -48,12 +50,12 @@ func highlightTag(rc render.Context) (string, error) {
} }
return buf.String(), nil return buf.String(), nil
}) })
if e, ok := err.(*exec.Error); ok { if pathErr, ok := err.(*fs.PathError); ok {
if e.Err == exec.ErrNotFound { if filepath.Base(pathErr.Path) == pygmentizeCmd {
r, err = `<code>`+html.EscapeString(s)+`</code>`, nil r, err = `<code>`+html.EscapeString(s)+`</code>`, nil
if !warnedMissingPygmentize { if !warnedMissingPygmentize {
warnedMissingPygmentize = true warnedMissingPygmentize = true
_, err = fmt.Fprintf(os.Stdout, "%s\nThe {%% highlight %%} tag will use <code>…</code> instead\n", err) _, err = fmt.Fprintf(os.Stdout, "Error: %s\nRun `pip install Pygments` to install %s.\nThe {%% highlight %%} tag will use <code>…</code> instead\n", pathErr, pygmentizeCmd)
} }
} }
} }