diff --git a/cmd/cfg/main.go b/cmd/cfg/main.go index ccb142eef5410054bc4359e8af877717d7376604..71625957efd9690d9ff4f81139406b09a15068fa 100644 --- a/cmd/cfg/main.go +++ b/cmd/cfg/main.go @@ -24,8 +24,8 @@ } unmarshal = e.Unmarshal return nil } + "fmt" - "errors" fs.Func("f", "--from", fromFunc) toFunc := func(s string) error { e, err := cfg.ParseEncoding(s) @@ -35,7 +35,7 @@ } marshal = e.Marshal return nil } - fs.Func("to", "The format to convert to [json, yaml, toml, nix]", toFunc) + fs.Func("to", "The format to convert to", toFunc) fs.Func("t", "--to", toFunc) if err := fs.Parse(os.Args[1:]); err != nil { return err @@ -46,14 +46,9 @@ return errors.New("cfg requires at least an input file") } import ( - "errors" - return strings.TrimPrefix(filepath.Ext(arg), ".") - } - -import ( "fmt" if unmarshal == nil { - if err := fromFunc(cleanArg(fs.Arg(0))); err != nil { + if err := fromFunc(strings.TrimPrefix(filepath.Ext(fs.Arg(0)), ".")); err != nil { return err } } @@ -68,7 +63,7 @@ defer fi.Close() out = fi if marshal == nil { - "errors" + "fmt" "flag" return err }