From 338dfae4f1d2a1f03a7317ccb671b5ced9304f24 Mon Sep 17 00:00:00 2001 From: Niklas Fasching Date: Tue, 31 May 2022 14:29:13 +0200 Subject: [PATCH] Remove goorgeous comparison `go mod tidy` kept including goorgeous and blackfriday for me - turns out go does not honor gitignore [1] and the correct way of ignoring a subdirectory is to place an empty `go.mod` file in it [2]. As I haven't looked in that file for quite some time and goorgeous has been deprecated let's rather just get rid of the comparison altogether. [1] the .go file requiring goorgeous was placed into `docs/` when running `make generate-gh-pages`. `docs/` is gitignored but not ignored by go [2] https://github.com/golang/go/wiki/Modules#can-an-additional-gomod-exclude-unnecessary-content-do-modules-have-the-equivalent-of-a-gitignore-file --- etc/_goorgeous.go | 34 ---------------------------------- etc/generate-gh-pages | 23 ----------------------- 2 files changed, 57 deletions(-) delete mode 100644 etc/_goorgeous.go diff --git a/etc/_goorgeous.go b/etc/_goorgeous.go deleted file mode 100644 index b2069b7..0000000 --- a/etc/_goorgeous.go +++ /dev/null @@ -1,34 +0,0 @@ -package main - -import ( - "io/ioutil" - "log" - "os" - - "github.com/chaseadamsio/goorgeous" - "github.com/russross/blackfriday" -) - -func main() { - defer func() { - if err := recover(); err != nil { - log.Print(err) - } - }() - log.SetFlags(0) - log.SetOutput(os.Stdout) - - path := os.Args[1] - in, err := ioutil.ReadFile(path) - if err != nil { - log.Fatal(err) - } - - flags := blackfriday.HTML_USE_XHTML - flags |= blackfriday.LIST_ITEM_BEGINNING_OF_LIST - flags |= blackfriday.HTML_FOOTNOTE_RETURN_LINKS - parameters := blackfriday.HtmlRendererParameters{} - parameters.FootnoteReturnLinkContents = "↩" - renderer := blackfriday.HtmlRendererWithParameters(flags, "", "", parameters) - log.Print(string(goorgeous.Org(in, renderer))) -} diff --git a/etc/generate-gh-pages b/etc/generate-gh-pages index 9ceb85b..9bd8cfc 100755 --- a/etc/generate-gh-pages +++ b/etc/generate-gh-pages @@ -128,32 +128,9 @@ convert=" rm -rf docs mkdir docs -go get github.com/chaseadamsio/goorgeous -cp etc/_goorgeous.go docs/goorgeous.go -go build -o docs/goorgeous docs/goorgeous.go -go_org_vs_goorgeous_examples=" - - - - " -for org_file in $org_files; do - echo generating content for $org_file - name=$(basename $org_file) - go_org_vs_goorgeous_examples+=" -

${name}

-
-
$(./docs/goorgeous $org_file)
-
$(./go-org render $org_file html-chroma)
-
" -done -go_org_vs_goorgeous_examples+="" echo "$index" > docs/index.html echo "$convert" > docs/convert.html -echo "$go_org_vs_goorgeous_examples" > docs/go-org-vs-goorgeous.html cp etc/_wasm.go docs/wasm.go GOOS=js GOARCH=wasm go build -o docs/main.wasm docs/wasm.go cp $(go env GOROOT)/misc/wasm/wasm_exec.js docs/wasm_exec.js