diff options
| -rw-r--r-- | cmd/commandfuncs.go | 20 | ||||
| -rw-r--r-- | cmd/commands.go | 1 | ||||
| -rw-r--r-- | cmd/packagesfuncs.go | 2 |
3 files changed, 16 insertions, 7 deletions
diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go index cc3f65c..bc62f28 100644 --- a/cmd/commandfuncs.go +++ b/cmd/commandfuncs.go @@ -360,6 +360,7 @@ func cmdBuildInfo(fl Flags) (int, error) { func cmdListModules(fl Flags) (int, error) { packages := fl.Bool("packages") versions := fl.Bool("versions") + skipStandard := fl.Bool("skip-standard") printModuleInfo := func(mi moduleInfo) { fmt.Print(mi.caddyModuleID) @@ -388,14 +389,19 @@ func cmdListModules(fl Flags) (int, error) { return caddy.ExitCodeSuccess, nil } - if len(standard) > 0 { - for _, mod := range standard { - printModuleInfo(mod) + // Standard modules (always shipped with Caddy) + if !skipStandard { + if len(standard) > 0 { + for _, mod := range standard { + printModuleInfo(mod) + } } + fmt.Printf("\n Standard modules: %d\n", len(standard)) } - fmt.Printf("\n Standard modules: %d\n", len(standard)) + + // Non-standard modules (third party plugins) if len(nonstandard) > 0 { - if len(standard) > 0 { + if len(standard) > 0 && !skipStandard { fmt.Println() } for _, mod := range nonstandard { @@ -403,8 +409,10 @@ func cmdListModules(fl Flags) (int, error) { } } fmt.Printf("\n Non-standard modules: %d\n", len(nonstandard)) + + // Unknown modules (couldn't get Caddy module info) if len(unknown) > 0 { - if len(standard) > 0 || len(nonstandard) > 0 { + if (len(standard) > 0 && !skipStandard) || len(nonstandard) > 0 { fmt.Println() } for _, mod := range unknown { diff --git a/cmd/commands.go b/cmd/commands.go index 7b184fd..f562430 100644 --- a/cmd/commands.go +++ b/cmd/commands.go @@ -208,6 +208,7 @@ config file; otherwise the default is assumed.`, fs := flag.NewFlagSet("list-modules", flag.ExitOnError) fs.Bool("packages", false, "Print package paths") fs.Bool("versions", false, "Print version information") + fs.Bool("skip-standard", false, "Skip printing standard modules") return fs }(), }) diff --git a/cmd/packagesfuncs.go b/cmd/packagesfuncs.go index 6aaf52b..c4f41ea 100644 --- a/cmd/packagesfuncs.go +++ b/cmd/packagesfuncs.go @@ -220,7 +220,7 @@ func getModules() (standard, nonstandard, unknown []moduleInfo, err error) { } func listModules(path string) error { - cmd := exec.Command(path, "list-modules", "--versions") + cmd := exec.Command(path, "list-modules", "--versions", "--skip-standard") cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr err := cmd.Run() |