From 151b4bff06ddd90772faefd2539c62230a32517b Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Sat, 4 Apr 2020 13:28:25 -0500 Subject: [PATCH] generate `mewn` files + cleanup --- cmd/helpers.go | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/cmd/helpers.go b/cmd/helpers.go index c7bf3b86b..4930280e1 100644 --- a/cmd/helpers.go +++ b/cmd/helpers.go @@ -183,21 +183,6 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project println(compileMessage) } - // embed resources - targetFiles, err := EmbedAssets() - if err != nil { - return err - } - - // cleanup temporary embedded assets - defer func() { - for _, filename := range targetFiles { - if err := os.Remove(filename); err != nil { - fmt.Println(err) - } - } - }() - buildCommand := slicer.String() buildCommand.Add("go") @@ -234,7 +219,7 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project fmt.Printf("Command: %v\n", buildCommand.AsSlice()) } - err = NewProgramHelper(projectOptions.Verbose).RunCommandArray(buildCommand.AsSlice()) + err := NewProgramHelper(projectOptions.Verbose).RunCommandArray(buildCommand.AsSlice()) if err != nil { if packSpinner != nil { packSpinner.Error() @@ -251,6 +236,22 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project // BuildApplication will attempt to build the project based on the given inputs func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error { var err error + + // embed resources + targetFiles, err := EmbedAssets() + if err != nil { + return err + } + + // cleanup temporary embedded assets + defer func() { + for _, filename := range targetFiles { + if err := os.Remove(filename); err != nil { + fmt.Println(err) + } + } + }() + if projectOptions.CrossCompile { err = BuildDocker(binaryName, buildMode, projectOptions) } else {