From 6d43931e173609b32614634f6fc3456328e6424c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 28 Feb 2018 03:22:00 -0500 Subject: [PATCH 1/2] fix: properly set help output for golang applications Closes #3007 --- plugins/config/src/commands/commands.go | 2 +- plugins/network/src/commands/commands.go | 2 +- plugins/repo/src/commands/commands.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/config/src/commands/commands.go b/plugins/config/src/commands/commands.go index e8a128a37..74817a297 100644 --- a/plugins/config/src/commands/commands.go +++ b/plugins/config/src/commands/commands.go @@ -44,7 +44,7 @@ func main() { args.Parse(os.Args[2:]) config.CommandShow(args.Args(), *global, *shell, *export, *merged) case "help": - fmt.Print(helpContent) + fmt.Print("\n config, Manages global and app-specific config vars\n") case "config:help": usage() default: diff --git a/plugins/network/src/commands/commands.go b/plugins/network/src/commands/commands.go index 6f98429d5..f67f470ff 100644 --- a/plugins/network/src/commands/commands.go +++ b/plugins/network/src/commands/commands.go @@ -34,7 +34,7 @@ func main() { case "network", "network:help": usage() case "help": - fmt.Print(helpContent) + fmt.Print("\n network, Manages network settings for an app\n") default: dokkuNotImplementExitCode, err := strconv.Atoi(os.Getenv("DOKKU_NOT_IMPLEMENTED_EXIT")) if err != nil { diff --git a/plugins/repo/src/commands/commands.go b/plugins/repo/src/commands/commands.go index 46c12a852..63c5f1a76 100644 --- a/plugins/repo/src/commands/commands.go +++ b/plugins/repo/src/commands/commands.go @@ -32,7 +32,7 @@ func main() { case "repo", "repo:help": usage() case "help": - fmt.Print(helpContent) + fmt.Print("\n repo, Runs commands that interact with the app's repo\n") default: dokkuNotImplementExitCode, err := strconv.Atoi(os.Getenv("DOKKU_NOT_IMPLEMENTED_EXIT")) if err != nil { From 1201b05dfab51789435e4388b208529185678d92 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 28 Feb 2018 03:23:50 -0500 Subject: [PATCH 2/2] fix: ignore a few files in the network plugin --- plugins/network/.gitignore | 1 + plugins/network/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/network/.gitignore b/plugins/network/.gitignore index 14fca6773..d63a5eb28 100644 --- a/plugins/network/.gitignore +++ b/plugins/network/.gitignore @@ -1,5 +1,6 @@ /commands /subcommands/* +/triggers/* /network-* /install /post-create diff --git a/plugins/network/Makefile b/plugins/network/Makefile index ce9105fda..656a22a3d 100644 --- a/plugins/network/Makefile +++ b/plugins/network/Makefile @@ -22,7 +22,7 @@ subcommands/%: src/subcommands/*/%.go go build $(GO_ARGS) -o $@ $< clean: - rm -rf commands subcommands network-* install post-create post-delete + rm -rf commands subcommands triggers network-* install post-create post-delete src-clean: rm -rf .gitignore src triggers vendor Makefile *.go