commands: Remove flagChanged from commandeer

diff --git a/commands/hugo.go b/commands/hugo.go
index 49b0fc7e5bc62d198fd7c2b931f62a18615afaca..cfadd226243facb2de89b6e08ccb628a4d40ed6e 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -461,13 +461,13 @@ func (c *commandeer) initializeFlags(cmd *cobra.Command) {
 }
 
 func (c *commandeer) setValueFromFlag(flags *flag.FlagSet, key string) {
-       if c.flagChanged(flags, key) {
+       if flagChanged(flags, key) {
                f := flags.Lookup(key)
                c.Set(key, f.Value.String())
        }
 }
 
-func (c *commandeer) flagChanged(flags *flag.FlagSet, key string) bool {
+func flagChanged(flags *flag.FlagSet, key string) bool {
        flag := flags.Lookup(key)
        if flag == nil {
                return false

diff --git a/commands/new.go b/commands/new.go
index a54ad5d2cb4a84697fa75ea4b5fcc6317bff1493..107c12d92ec263d01a094bad42563a98c6ca766d 100644 (file)
--- a/commands/new.go
+++ b/commands/new.go
@@ -95,11 +95,11 @@ func NewContent(cmd *cobra.Command, args []string) error {
 
        c := newCommandeer(cfg)
 
-       if c.flagChanged(cmd.Flags(), "format") {
+       if flagChanged(cmd.Flags(), "format") {
                c.Set("metaDataFormat", configFormat)
        }
 
-       if c.flagChanged(cmd.Flags(), "editor") {
+       if flagChanged(cmd.Flags(), "editor") {
                c.Set("newContentEditor", contentEditor)
        }
 

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