From 2ccabc772b609e1efed56345edbecb9c8f2a899a Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Wed, 20 Feb 2019 22:54:06 +1100
Subject: [PATCH] try and simplify

---
 cmd/helpers.go       |  5 +++++
 cmd/wails/4_build.go | 15 +++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cmd/helpers.go b/cmd/helpers.go
index 9caa444a9..f3ef176ef 100644
--- a/cmd/helpers.go
+++ b/cmd/helpers.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/leaanthony/slicer"
 	"github.com/leaanthony/spinner"
+	"github.com/wailsapp/wails/cmd"
 )
 
 // ValidateFrontendConfig checks if the frontend config is valid
@@ -99,6 +100,10 @@ func PackageApplication(projectOptions *ProjectOptions) error {
 	// Package app
 	message := "Generating .app"
 	if runtime.GOOS == "windows" {
+		err = cmd.CheckWindres()
+		if err != nil {
+			return err
+		}
 		message = "Generating resource bundle"
 	}
 	packageSpinner := spinner.New(message)
diff --git a/cmd/wails/4_build.go b/cmd/wails/4_build.go
index f9c0778cc..61623bb45 100644
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -25,6 +25,7 @@ func init() {
 		BoolFlag("d", "Build in Debug mode", &debugMode)
 
 	initCmd.Action(func() error {
+
 		log := cmd.NewLogger()
 		message := "Building Application"
 		if forceRebuild {
@@ -95,16 +96,10 @@ func init() {
 			buildMode = cmd.BuildModeDebug
 		}
 
-		if runtime.GOOS == "windows" {
-			if packageApp {
-				err = cmd.CheckWindres()
-				if err != nil {
-					return err
-				}
-				err = cmd.PackageApplication(projectOptions)
-				if err != nil {
-					return err
-				}
+		if runtime.GOOS == "windows" && packageApp {
+			err = cmd.PackageApplication(projectOptions)
+			if err != nil {
+				return err
 			}
 		}
 		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode)