From db3f4056d590573ed8921fad5d3460f97617b168 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Mon, 20 Jul 2015 13:09:08 +0900 Subject: [PATCH] Allow .tml and .yml extensions, add nomacro flag --- homemaker.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/homemaker.go b/homemaker.go index ac92473..105c220 100644 --- a/homemaker.go +++ b/homemaker.go @@ -43,6 +43,7 @@ const ( flagVerbose flagNoCmd flagNoLink + flagNoMacro ) func parse(filename string) (*config, error) { @@ -57,11 +58,11 @@ func parse(filename string) (*config, error) { if err := json.Unmarshal(bytes, &conf); err != nil { return nil, err } - case ".toml": + case ".toml", ".tml": if err := toml.Unmarshal(bytes, &conf); err != nil { return nil, err } - case ".yaml": + case ".yaml", ".yml": if err := yaml.Unmarshal(bytes, &conf); err != nil { return nil, err } @@ -101,6 +102,7 @@ func main() { verbose := flag.Bool("verbose", false, "verbose output") nocmd := flag.Bool("nocmd", false, "don't execute commands") nolink := flag.Bool("nolink", false, "don't create links") + nomacro := flag.Bool("nomacro", false, "don't execute macros") flag.Usage = usage flag.Parse() @@ -121,6 +123,9 @@ func main() { if *nolink { flags |= flagNoLink } + if *nomacro { + flags |= flagNoMacro + } if flag.NArg() == 2 { confDirAbs := makeAbsPath(flag.Arg(0))