comands: Make the config command non-global

See #4598

diff --git a/commands/hugo.go b/commands/hugo.go
index 1237eaea18194771304352d92cec4a4a201f2832..3a45c3046844c0a5e4e32b788882369c11573e8d 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -196,7 +196,7 @@ func AddCommands() {
        HugoCmd.AddCommand(serverCmd)
        HugoCmd.AddCommand(newVersionCmd().getCommand())
        HugoCmd.AddCommand(newEnvCmd().getCommand())
-       HugoCmd.AddCommand(configCmd)
+       HugoCmd.AddCommand(newConfigCmd().getCommand())
        HugoCmd.AddCommand(newCheckCmd().getCommand())
        HugoCmd.AddCommand(newBenchmarkCmd().getCommand())
        HugoCmd.AddCommand(newConvertCmd().getCommand())

diff --git a/commands/limit_darwin.go b/commands/limit_darwin.go
index e35c24de4a6f3bd7b251f98cdef61cdfdbd2f59e..bc5f42a57a4cfe28ff9a9379b8a45a72e5baea92 100644 (file)
--- a/commands/limit_darwin.go
+++ b/commands/limit_darwin.go
@@ -1,17 +1,4 @@
-// Copyright 2015 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Copyright 2015 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/commands/list_config.go b/commands/list_config.go
index 031bff73f2ad0a82ad18a38e30d0263cb44c9fba..b0399159231fa72e59e0e86f567f0d198c9c6a69 100644 (file)
--- a/commands/list_config.go
+++ b/commands/list_config.go
@@ -22,18 +22,30 @@ import (
        "github.com/spf13/viper"
 )
 
-var configCmd = &cobra.Command{
-       Use:   "config",
-       Short: "Print the site configuration",
-       Long:  `Print the site configuration, both default and custom settings.`,
+var _ cmder = (*configCmd)(nil)
+
+type configCmd struct {
+       cmd *cobra.Command
+}
+
+func (c *configCmd) getCommand() *cobra.Command {
+       return c.cmd
 }
 
-func init() {
-       configCmd.RunE = printConfig
+func newConfigCmd() *configCmd {
+       cc := &configCmd{}
+       cc.cmd = &cobra.Command{
+               Use:   "config",
+               Short: "Print the site configuration",
+               Long:  `Print the site configuration, both default and custom settings.`,
+               RunE:  cc.printConfig,
+       }
+
+       return cc
 }
 
-func printConfig(cmd *cobra.Command, args []string) error {
-       cfg, err := InitializeConfig(false, nil, configCmd)
+func (c *configCmd) printConfig(cmd *cobra.Command, args []string) error {
+       cfg, err := InitializeConfig(false, nil, c.cmd)
 
        if err != nil {
                return err

diff --git a/commands/version.go b/commands/version.go
index 978a5440d6025c2851eddf5b06b7506826336be7..4498c36116512cf44fbb516720885b7b85ee7740 100644 (file)
--- a/commands/version.go
+++ b/commands/version.go
@@ -29,6 +29,10 @@ type versionCmd struct {
        cmd *cobra.Command
 }
 
+func (c *versionCmd) getCommand() *cobra.Command {
+       return c.cmd
+}
+
 func newVersionCmd() *versionCmd {
        return &versionCmd{
                &cobra.Command{
@@ -43,10 +47,6 @@ func newVersionCmd() *versionCmd {
        }
 }
 
-func (c *versionCmd) getCommand() *cobra.Command {
-       return c.cmd
-}
-
 func printHugoVersion() {
        if hugolib.CommitHash == "" {
                jww.FEEDBACK.Printf("Hugo Static Site Generator v%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)