From 4671a58f40c5934304add1df091dd97e16d58dd7 Mon Sep 17 00:00:00 2001 From: Baruch Lubinsky Date: Fri, 17 Oct 2014 14:04:53 +0200 Subject: [PATCH] change default package to containing folder of output --- go-bindata/main.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/go-bindata/main.go b/go-bindata/main.go index 503a059..cc7bd2b 100644 --- a/go-bindata/main.go +++ b/go-bindata/main.go @@ -82,6 +82,24 @@ func parseArgs() *bindata.Config { c.Input[i] = parseInput(flag.Arg(i)) } + // Change pkg to containing directory of output. If output flag is set and package flag is not. + pkgSet := false + outputSet := false + flag.Visit(func(f *flag.Flag) { + if f.Name == "pkg" { + pkgSet = true + } + if f.Name == "o" { + outputSet = true + } + }) + if outputSet && !pkgSet { + pkg := filepath.Base(filepath.Dir(c.Output)) + if pkg != "." && pkg != "/" { + c.Package = pkg + } + } + return c }