mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-25 22:00:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd: Replace flagChanged with pflag.FlagSet.Changed

Browse Source
This commit is contained in:
Albert Nigmatzianov
2017-05-24 10:51:48 +02:00
parent 0a40cb43ea
commit 421a46947a
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
commands/hugo.go
View File

@@ -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()