Update make site-docs to reflect latest setup

mislav · mislav · commit 04aff00798ac · 2020-01-31T15:35:57.000+01:00
- Man pages are now placed under `/manual/`
- Use Jekyll `permalink` to avoid the `.html` extension
- Strip "SEE ALSO" and everything after it
diff --git a/Makefile b/Makefile
@@ -21,9 +21,11 @@ site:
 
 site-docs: site
 	git -C site pull
-	git -C site rm 'gh*.md' 2>/dev/null || true
-	go run ./cmd/gen-docs site
-	git -C site add 'gh*.md'
+	git -C site rm 'manual/gh*.md' 2>/dev/null || true
+	go run ./cmd/gen-docs site/manual
+	for f in site/manual/gh*.md; do sed -i.bak -e '/^### SEE ALSO/,$$d' "$$f"; done
+	rm -f site/manual/*.bak
+	git -C site add 'manual/gh*.md'
 	git -C site commit -m 'update help docs'
 	git -C site push
 .PHONY: site-docs
diff --git a/cmd/gen-docs/main.go b/cmd/gen-docs/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/cli/cli/command"
 	"github.com/spf13/cobra/doc"
@@ -28,13 +29,14 @@ func main() {
 func filePrepender(filename string) string {
 	return `---
 layout: page
+permalink: /:path/:basename
 ---
 
 `
 }
 
 func linkHandler(name string) string {
-	return fmt.Sprintf("{{site.baseurl}}{%% link %s %%}", name)
+	return fmt.Sprintf("./%s", strings.TrimSuffix(name, ".md"))
 }
 
 func fatal(msg interface{}) {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"os"`
	`6`	`+ "strings"`
`6`	`7`
`7`	`8`	`"github.com/cli/cli/command"`
`8`	`9`	`"github.com/spf13/cobra/doc"`
`@@ -28,13 +29,14 @@ func main() {`
`28`	`29`	`func filePrepender(filename string) string {`
`29`	`30`	return `---
`30`	`31`	`layout: page`
	`32`	`+permalink: /:path/:basename`
`31`	`33`	`---`
`32`	`34`
`33`	`35`	`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`func linkHandler(name string) string {`
`37`		`- return fmt.Sprintf("{{site.baseurl}}{%% link %s %%}", name)`
	`39`	`+ return fmt.Sprintf("./%s", strings.TrimSuffix(name, ".md"))`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`func fatal(msg interface{}) {`