From cac97e86523db66dd3f6099566c2705d695eaf41 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Wed, 20 Feb 2019 23:01:33 +1100
Subject: [PATCH] small refactor

---
 cmd/helpers.go       | 31 +++++++++++++++++++++++++++----
 cmd/wails/4_build.go | 23 +----------------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/cmd/helpers.go b/cmd/helpers.go
index f3ef176e..8c926581 100644
--- a/cmd/helpers.go
+++ b/cmd/helpers.go
@@ -12,7 +12,6 @@ import (
 
 	"github.com/leaanthony/slicer"
 	"github.com/leaanthony/spinner"
-	"github.com/wailsapp/wails/cmd"
 )
 
 // ValidateFrontendConfig checks if the frontend config is valid
@@ -48,7 +47,22 @@ func InstallGoDependencies() error {
 }
 
 // BuildApplication will attempt to build the project based on the given inputs
-func BuildApplication(binaryName string, forceRebuild bool, buildMode string) error {
+func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
+
+	// Generate Windows assets if needed
+	if runtime.GOOS == "windows" && packageApp {
+		err := PackageApplication(projectOptions)
+		if err != nil {
+			return err
+		}
+	}
+
+	// Check Mewn is installed
+	err := CheckMewn()
+	if err != nil {
+		return err
+	}
+
 	compileMessage := "Packing + Compiling project"
 
 	if buildMode == BuildModeDebug {
@@ -86,12 +100,21 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string) er
 	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
 
 	buildCommand.AddSlice([]string{"-ldflags", ldflags})
-	err := NewProgramHelper().RunCommandArray(buildCommand.AsSlice())
+	err = NewProgramHelper().RunCommandArray(buildCommand.AsSlice())
 	if err != nil {
 		packSpinner.Error()
 		return err
 	}
 	packSpinner.Success()
+
+	// Package application
+	if runtime.GOOS != "windows" && packageApp {
+		err = PackageApplication(projectOptions)
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -100,7 +123,7 @@ func PackageApplication(projectOptions *ProjectOptions) error {
 	// Package app
 	message := "Generating .app"
 	if runtime.GOOS == "windows" {
-		err = cmd.CheckWindres()
+		err := CheckWindres()
 		if err != nil {
 			return err
 		}
diff --git a/cmd/wails/4_build.go b/cmd/wails/4_build.go
index 61623bb4..e289cc77 100644
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"runtime"
 
 	"github.com/leaanthony/spinner"
 	"github.com/wailsapp/wails/cmd"
@@ -61,12 +60,6 @@ func init() {
 			}
 		}
 
-		// Check Mewn is installed
-		err = cmd.CheckMewn()
-		if err != nil {
-			return err
-		}
-
 		// Save project directory
 		projectDir := fs.Cwd()
 
@@ -96,25 +89,11 @@ func init() {
 			buildMode = cmd.BuildModeDebug
 		}
 
-		if runtime.GOOS == "windows" && packageApp {
-			err = cmd.PackageApplication(projectOptions)
-			if err != nil {
-				return err
-			}
-		}
-		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode)
+		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode, packageApp, projectOptions)
 		if err != nil {
 			return err
 		}
 
-		// Package application
-		if runtime.GOOS != "windows" && packageApp {
-			err = cmd.PackageApplication(projectOptions)
-			if err != nil {
-				return err
-			}
-		}
-
 		logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name)
 
 		return nil