re
/
pkger
forked from mirror/pkger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30 from nlepage/fix/out_pkged 

fix embed not working with -o
This commit is contained in:
Mark Bates 2019-11-11 14:55:39 -08:00 committed by GitHub
parent 7067fa6132 b97aa787b5
commit f25d3ebfe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/pkger/cmds/pack.go
View File

@ -53,7 +53,7 @@ func (e *packCmd) Exec(args []string) error {
return err return err
} }
if err := Package(fp, decls); err != nil { if err := Package(info, fp, decls); err != nil {
return err return err
} }
@ -123,7 +123,7 @@ func (e *packCmd) Flags() *flag.FlagSet {
return e.FlagSet return e.FlagSet
} }
func Package(out string, decls parser.Decls) error { func Package(info here.Info, out string, decls parser.Decls) error {
os.RemoveAll(out) os.RemoveAll(out)
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
@ -146,7 +146,7 @@ func Package(out string, decls parser.Decls) error {
fmt.Fprintf(f, "import \"github.com/markbates/pkger/pkging/mem\"\n\n") fmt.Fprintf(f, "import \"github.com/markbates/pkger/pkging/mem\"\n\n")
fmt.Fprintf(f, "\nvar _ = pkger.Apply(mem.UnmarshalEmbed([]byte(`") fmt.Fprintf(f, "\nvar _ = pkger.Apply(mem.UnmarshalEmbed([]byte(`")
if err := pkgutil.Stuff(f, c, decls); err != nil { if err := pkgutil.Stuff(f, info, decls); err != nil {
return err return err
} }