From dc1edf8e640f4d0f4d4a8bc01a7459ff8123705e Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Sat, 23 Feb 2019 13:02:18 +0100 Subject: generator cleanup --- doc/gen_manpage.go | 15 +++++++++++++-- doc/gen_markdown.go | 20 ++++++++++++++++---- misc/gen_bash_completion.go | 7 ++++--- misc/gen_zsh_completion.go | 3 ++- misc/random_bugs/main.go | 2 +- 5 files changed, 36 insertions(+), 11 deletions(-) diff --git a/doc/gen_manpage.go b/doc/gen_manpage.go index 4147d915..0c7a501a 100644 --- a/doc/gen_manpage.go +++ b/doc/gen_manpage.go @@ -7,6 +7,7 @@ import ( "log" "os" "path" + "path/filepath" "github.com/MichaelMure/git-bug/commands" "github.com/spf13/cobra/doc" @@ -14,7 +15,7 @@ import ( func main() { cwd, _ := os.Getwd() - filepath := path.Join(cwd, "doc", "man") + dir := path.Join(cwd, "doc", "man") header := &doc.GenManHeader{ Title: "GIT-BUG", @@ -24,7 +25,17 @@ func main() { fmt.Println("Generating manpage ...") - err := doc.GenManTree(commands.RootCmd, header, filepath) + files, err := filepath.Glob(dir + "/*.1") + if err != nil { + log.Fatal(err) + } + for _, f := range files { + if err := os.Remove(f); err != nil { + log.Fatal(err) + } + } + + err = doc.GenManTree(commands.RootCmd, header, dir) if err != nil { log.Fatal(err) } diff --git a/doc/gen_markdown.go b/doc/gen_markdown.go index ee87d544..47194666 100644 --- a/doc/gen_markdown.go +++ b/doc/gen_markdown.go @@ -4,20 +4,32 @@ package main import ( "fmt" - "github.com/MichaelMure/git-bug/commands" - "github.com/spf13/cobra/doc" "log" "os" "path" + "path/filepath" + + "github.com/MichaelMure/git-bug/commands" + "github.com/spf13/cobra/doc" ) func main() { cwd, _ := os.Getwd() - filepath := path.Join(cwd, "doc", "md") + dir := path.Join(cwd, "doc", "md") fmt.Println("Generating Markdown documentation ...") - err := doc.GenMarkdownTree(commands.RootCmd, filepath) + files, err := filepath.Glob(dir + "/*.md") + if err != nil { + log.Fatal(err) + } + for _, f := range files { + if err := os.Remove(f); err != nil { + log.Fatal(err) + } + } + + err = doc.GenMarkdownTree(commands.RootCmd, dir) if err != nil { log.Fatal(err) } diff --git a/misc/gen_bash_completion.go b/misc/gen_bash_completion.go index 8793556a..f2506606 100644 --- a/misc/gen_bash_completion.go +++ b/misc/gen_bash_completion.go @@ -4,19 +4,20 @@ package main import ( "fmt" - "github.com/MichaelMure/git-bug/commands" "log" "os" "path" + + "github.com/MichaelMure/git-bug/commands" ) func main() { cwd, _ := os.Getwd() - filepath := path.Join(cwd, "misc", "bash_completion", "git-bug") + dir := path.Join(cwd, "misc", "bash_completion", "git-bug") fmt.Println("Generating bash completion file ...") - err := commands.RootCmd.GenBashCompletionFile(filepath) + err := commands.RootCmd.GenBashCompletionFile(dir) if err != nil { log.Fatal(err) } diff --git a/misc/gen_zsh_completion.go b/misc/gen_zsh_completion.go index 41e08f9a..184cab43 100644 --- a/misc/gen_zsh_completion.go +++ b/misc/gen_zsh_completion.go @@ -4,10 +4,11 @@ package main import ( "fmt" - "github.com/MichaelMure/git-bug/commands" "log" "os" "path" + + "github.com/MichaelMure/git-bug/commands" ) func main() { diff --git a/misc/random_bugs/main.go b/misc/random_bugs/main.go index 31b12e45..274b3dac 100644 --- a/misc/random_bugs/main.go +++ b/misc/random_bugs/main.go @@ -17,7 +17,7 @@ func main() { panic(err) } - repo, err := repository.NewGitRepo(dir, func(repo *repository.GitRepo) error { + repo, err := repository.NewGitRepo(dir, func(repo repository.ClockedRepo) error { return nil }) if err != nil { -- cgit