cmd: Replace flagChanged with pflag.FlagSet.Changed

diff --git a/commands/hugo.go b/commands/hugo.go
index e6514a0e0839f7a5c959a28635861ccd4fb21741..eaf75e32980a160298b936ac3e5bb2149057864e 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -467,15 +467,15 @@ func (c *commandeer) initializeFlags(cmd *cobra.Command) {
        }
 
        // Remove these in Hugo 0.23.
-       if flagChanged(cmd.Flags(), "disable404") {
+       if cmd.Flags().Changed("disable404") {
                helpers.Deprecated("command line", "--disable404", "Use --disableKinds=404", false)
        }
 
-       if flagChanged(cmd.Flags(), "disableRSS") {
+       if cmd.Flags().Changed("disableRSS") {
                helpers.Deprecated("command line", "--disableRSS", "Use --disableKinds=RSS", false)
        }
 
-       if flagChanged(cmd.Flags(), "disableSitemap") {
+       if cmd.Flags().Changed("disableSitemap") {
                helpers.Deprecated("command line", "--disableSitemap", "Use --disableKinds=sitemap", false)
        }
 
@@ -489,20 +489,12 @@ func (c *commandeer) initializeFlags(cmd *cobra.Command) {
 }
 
 func (c *commandeer) setValueFromFlag(flags *flag.FlagSet, key string) {
-       if flagChanged(flags, key) {
+       if flags.Changed(key) {
                f := flags.Lookup(key)
                c.Set(key, f.Value.String())
        }
 }
 
-func flagChanged(flags *flag.FlagSet, key string) bool {
-       flag := flags.Lookup(key)
-       if flag == nil {
-               return false
-       }
-       return flag.Changed
-}
-
 func (c *commandeer) watchConfig() {
        v := c.Cfg.(*viper.Viper)
        v.WatchConfig()

diff --git a/commands/new.go b/commands/new.go
index a4fe6021e35a0cc1c06774841a918fe487452fa2..d8548ebdc4ce82937f33d326daa7d4f78c896d32 100644 (file)
--- a/commands/new.go
+++ b/commands/new.go
@@ -98,11 +98,11 @@ func NewContent(cmd *cobra.Command, args []string) error {
                return err
        }
 
-       if flagChanged(cmd.Flags(), "format") {
+       if cmd.Flags().Changed("format") {
                c.Set("metaDataFormat", configFormat)
        }
 
-       if flagChanged(cmd.Flags(), "editor") {
+       if cmd.Flags().Changed("editor") {
                c.Set("newContentEditor", contentEditor)
        }
 

diff --git a/commands/server.go b/commands/server.go
index 0e719e17df9e5eba4d4b1424c4c9fa27df3d33b2..bb0f19cfacd77a9890143c4e442828cf3e8ae01e 100644 (file)
--- a/commands/server.go
+++ b/commands/server.go
@@ -106,7 +106,7 @@ func server(cmd *cobra.Command, args []string) error {
                return err
        }
 
-       if flagChanged(cmd.Flags(), "disableLiveReload") {
+       if cmd.Flags().Changed("disableLiveReload") {
                c.Set("disableLiveReload", disableLiveReload)
        }
 
@@ -123,7 +123,7 @@ func server(cmd *cobra.Command, args []string) error {
        if err == nil {
                l.Close()
        } else {
-               if flagChanged(serverCmd.Flags(), "port") {
+               if serverCmd.Flags().Changed("port") {
                        // port set explicitly by user -- he/she probably meant it!
                        return newSystemErrorF("Server startup failed: %s", err)
                }