From c94117601897e09cd5ab315761874cd1fc4cc244 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 5 Feb 2019 08:06:18 +1100 Subject: [PATCH] simplify Serve --- cmd/helpers.go | 24 ++++++++++++++++++++++++ cmd/wails/6_serve.go | 24 +----------------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/cmd/helpers.go b/cmd/helpers.go index 27e7afd3..3aa382dc 100644 --- a/cmd/helpers.go +++ b/cmd/helpers.go @@ -4,9 +4,11 @@ import ( "fmt" "io/ioutil" "os" + "os/exec" "path" "path/filepath" "runtime" + "time" "github.com/leaanthony/slicer" "github.com/leaanthony/spinner" @@ -192,6 +194,28 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc return nil } +func ServeProject(projectOptions *ProjectOptions, logger *Logger) error { + go func() { + time.Sleep(2 * time.Second) + logger.Green(">>>>> To connect, you will need to run '" + projectOptions.FrontEnd.Serve + "' in the '" + projectOptions.FrontEnd.Dir + "' directory <<<<<") + }() + location, err := filepath.Abs(projectOptions.BinaryName) + if err != nil { + return err + } + + logger.Yellow("Serving Application: " + location) + cmd := exec.Command(location) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + err = cmd.Run() + if err != nil { + return err + } + + return nil +} + // func CopyBridgeFile(projectDir string, projectOptions ProjectOptions, bridgeMode bool) error { // // Copy bridge to project // fs := NewFSHelper() diff --git a/cmd/wails/6_serve.go b/cmd/wails/6_serve.go index 8aa0b15e..0ab41f7d 100644 --- a/cmd/wails/6_serve.go +++ b/cmd/wails/6_serve.go @@ -3,9 +3,6 @@ package main import ( "fmt" "os" - "os/exec" - "path/filepath" - "time" "github.com/leaanthony/spinner" "github.com/wailsapp/wails/cmd" @@ -94,25 +91,6 @@ func init() { } logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name) - - go func() { - time.Sleep(2 * time.Second) - logger.Green(">>>>> To connect, you will need to run '" + projectOptions.FrontEnd.Serve + "' in the '" + projectOptions.FrontEnd.Dir + "' directory <<<<<") - }() - location, err := filepath.Abs(projectOptions.BinaryName) - if err != nil { - return err - } - - logger.Yellow("Serving Application: " + location) - cmd := exec.Command(location) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - err = cmd.Run() - if err != nil { - return err - } - - return nil + return cmd.ServeProject(projectOptions, logger) }) }