Merge pull request #8 from sigmonsays/fix-config-flags

fix flag hangling for app global
sigmonsays · Nov 26, 2022 · d783a13 · d783a13
2 parents f468e57 + 1a19a7f
commit d783a13
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/cleanup.go b/cleanup.go
@@ -15,7 +15,7 @@ func (me *Cleanup) Flags() []cli.Flag {
 }
 
 func (me *Cleanup) Run(c *cli.Context) error {
-	configfiles := getConfigFiles(c)
+	configfiles := me.ctx.getConfigFiles(c)
 
 	for _, filename := range configfiles {
 		err := me.RunFile(filename)

diff --git a/common.go b/common.go
@@ -6,9 +6,18 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-func getConfigFiles(c *cli.Context) []string {
+type Context struct {
+	app     *cli.App
+	configs []string
+}
+
+func (me *Context) addCommand(cmd *cli.Command) {
+	me.app.Commands = append(me.app.Commands, cmd)
+}
+
+func (me *Context) getConfigFiles(c *cli.Context) []string {
 	defaultFile := "dotbot.yaml"
-	ret := c.StringSlice("config")
+	ret := me.configs
 
 	if len(ret) == 0 {
 		st, err := os.Stat(defaultFile)
@@ -19,11 +28,3 @@ func getConfigFiles(c *cli.Context) []string {
 	}
 	return ret
 }
-
-type Context struct {
-	app *cli.App
-}
-
-func (me *Context) addCommand(cmd *cli.Command) {
-	me.app.Commands = append(me.app.Commands, cmd)
-}
diff --git a/link.go b/link.go
@@ -40,7 +40,7 @@ type LinkOptions struct {
 
 func (me *Link) Run(c *cli.Context) error {
 	opts := &LinkOptions{}
-	configfiles := getConfigFiles(c)
+	configfiles := me.ctx.getConfigFiles(c)
 	opts.Pretend = c.Bool("pretend")
 	opts.AutoMode = c.Bool("auto")
 	log.Tracef("%d files to execute", len(configfiles))
@@ -165,7 +165,6 @@ func (me *Link) RunAutoMode(opts *LinkOptions) error {
 		return err
 	}
 
-
 	// build config using current directory listing
 	for _, filename := range filenames {
 		if filename == ".git" {

diff --git a/main.go b/main.go
@@ -37,6 +37,8 @@ func main() {
 				gologging.SetLogLevel(loglevel)
 			}
 
+			ctx.configs = c.StringSlice("config")
+
 			return nil
 		},
 	}

diff --git a/status.go b/status.go
@@ -29,7 +29,7 @@ func (me *Status) Flags() []cli.Flag {
 }
 
 func (me *Status) Run(c *cli.Context) error {
-	configfiles := getConfigFiles(c)
+	configfiles := me.ctx.getConfigFiles(c)
 	asJson := c.Bool("json")
 	showAll := c.Bool("all")
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,8 @@ func main() { @@
     				gologging.SetLogLevel(loglevel)
     			}
+    			ctx.configs = c.StringSlice("config")
     			return nil
     		},
     	}
@@ Expand Down @@