From 085120973a2d272a0c4f981d1e70490bbd6f1dd2 Mon Sep 17 00:00:00 2001 From: Victor Vrantchan Date: Sat, 11 Jul 2020 22:57:23 -0400 Subject: [PATCH] Moved ffOptions from top level block. Moved directly into the root command struct. For clarity, since it's not used anywhere else. Might consider something else if there are sub-commands with shared options. Also added `MICROMDM` as the env var prefix. --- cmd/micromdm/micromdm.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cmd/micromdm/micromdm.go b/cmd/micromdm/micromdm.go index ee178534..29bfe08c 100644 --- a/cmd/micromdm/micromdm.go +++ b/cmd/micromdm/micromdm.go @@ -30,12 +30,11 @@ func writePID(path string) error { func micromdm(args []string, stdin io.Reader, stdout, stderr io.Writer) int { var ( - ctx = context.Background() - logger = log.New(log.Output(stderr)) - ffOptions = []ff.Option{ff.WithConfigFileParser(ff.PlainParser), ff.WithConfigFileFlag("config")} - rootfs = flag.NewFlagSet("micromdm", flag.ContinueOnError) - pidfile = rootfs.String("pidfile", "/tmp/micromdm.pid", "Path to server pidfile") - _ = rootfs.String("config", "", "Path to config file (optional)") + ctx = context.Background() + logger = log.New(log.Output(stderr)) + rootfs = flag.NewFlagSet("micromdm", flag.ContinueOnError) + pidfile = rootfs.String("pidfile", "/tmp/micromdm.pid", "Path to server pidfile") + _ = rootfs.String("config", "", "Path to config file (optional)") ) // default output is os.Stderr. @@ -65,7 +64,7 @@ func micromdm(args []string, stdin io.Reader, stdout, stderr io.Writer) int { root := &ffcli.Command{ ShortUsage: "micromdm [flags] ", FlagSet: rootfs, - Options: ffOptions, + Options: []ff.Option{ff.WithEnvVarPrefix("MICROMDM"), ff.WithConfigFileParser(ff.PlainParser), ff.WithConfigFileFlag("config")}, Subcommands: []*ffcli.Command{helpCmd, version}, Exec: func(context.Context, []string) error { if err := writePID(*pidfile); err != nil {