commands: Make the new commands non-global

See #4598

1 files changed, 24 insertions, 11 deletions

diff --git a/commands/env.go b/commands/env.go
index 54c98d527..700cddf5a 100644
--- a/commands/env.go
+++ b/commands/env.go
@@ -20,16 +20,29 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-var envCmd = &cobra.Command{
-	Use:   "env",
-	Short: "Print Hugo version and environment info",
-	Long:  `Print Hugo version and environment info. This is useful in Hugo bug reports.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		printHugoVersion()
-		jww.FEEDBACK.Printf("GOOS=%q\n", runtime.GOOS)
-		jww.FEEDBACK.Printf("GOARCH=%q\n", runtime.GOARCH)
-		jww.FEEDBACK.Printf("GOVERSION=%q\n", runtime.Version())
-
-		return nil
+var _ cmder = (*envCmd)(nil)
+
+type envCmd struct {
+	cmd *cobra.Command
+}
+
+func (c *envCmd) getCommand() *cobra.Command {
+	return c.cmd
+}
+
+func newEnvCmd() *envCmd {
+	return &envCmd{cmd: &cobra.Command{
+		Use:   "env",
+		Short: "Print Hugo version and environment info",
+		Long:  `Print Hugo version and environment info. This is useful in Hugo bug reports.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			printHugoVersion()
+			jww.FEEDBACK.Printf("GOOS=%q\n", runtime.GOOS)
+			jww.FEEDBACK.Printf("GOARCH=%q\n", runtime.GOARCH)
+			jww.FEEDBACK.Printf("GOVERSION=%q\n", runtime.Version())
+
+			return nil
+		},
 	},
+	}
 }