diff --git a/app_cli.go b/app_cli.go index ece1fecae..b711c3473 100644 --- a/app_cli.go +++ b/app_cli.go @@ -21,7 +21,7 @@ func (app *App) setupCli() *cmd.Cli { // Banner result.PreRun(func(cli *cmd.Cli) error { log := cmd.NewLogger() - log.PrintBanner() + log.PrintSmallBanner() fmt.Println() log.YellowUnderline(app.config.Title + " - Debug Build") return nil diff --git a/cmd/cli.go b/cmd/cli.go index cb3a01172..a63cb7083 100644 --- a/cmd/cli.go +++ b/cmd/cli.go @@ -194,6 +194,7 @@ func (c *Command) Action(callback Action) *Command { // PrintHelp - Output the help text for this command func (c *Command) PrintHelp() { + c.log.PrintBanner() versionString := c.AppVersion if versionString != "" { versionString = " " + versionString @@ -211,7 +212,6 @@ func (c *Command) PrintHelp() { fmt.Println(c.Longdescription + "\n") } if len(c.SubCommands) > 0 { - fmt.Println("") c.log.White("Available commands:") fmt.Println("") for _, subcommand := range c.SubCommands { @@ -222,9 +222,9 @@ func (c *Command) PrintHelp() { } fmt.Printf(" %s%s%s %s\n", subcommand.Name, spacer, subcommand.Shortdescription, isDefault) } + fmt.Println("") } if c.flagCount > 0 { - fmt.Println("") c.log.White("Flags:") fmt.Println() c.Flags.SetOutput(os.Stdout) diff --git a/cmd/log.go b/cmd/log.go index 6d360ed8f..fb210ab43 100644 --- a/cmd/log.go +++ b/cmd/log.go @@ -99,6 +99,16 @@ func (l *Logger) Error(format string, a ...interface{}) { color.New(color.FgHiRed).PrintfFunc()("Error: "+format+"\n", a...) } +func (l *Logger) PrintSmallBanner(message ...string) { + yellow := color.New(color.FgYellow).SprintFunc() + red := color.New(color.FgRed).SprintFunc() + msg := "" + if len(message) > 0 { + msg = " - " + message[0] + } + fmt.Printf("%s %s%s\n", yellow("Wails"), red(Version), msg) +} + // PrintBanner prints the Wails banner before running commands func (l *Logger) PrintBanner() error { banner1 := ` _ __ _ __ diff --git a/cmd/version.go b/cmd/version.go index 7ddeec6a5..82e40dd7f 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -2,4 +2,4 @@ package cmd // Version - Wails version // ...oO(There must be a better way) -const Version = "v0.9.1" +const Version = "v0.9.2" diff --git a/cmd/wails/0_setup.go b/cmd/wails/0_setup.go index 49055103d..d82ff4b4e 100644 --- a/cmd/wails/0_setup.go +++ b/cmd/wails/0_setup.go @@ -18,6 +18,8 @@ func init() { setupCommand.Action(func() error { + logger.PrintBanner(); + system := cmd.NewSystemHelper() err := system.Initialise() if err != nil { diff --git a/cmd/wails/2_init.go b/cmd/wails/2_init.go index ce9bb23ed..f2c4b7596 100644 --- a/cmd/wails/2_init.go +++ b/cmd/wails/2_init.go @@ -24,7 +24,7 @@ Any flags that are required and not given will be prompted for.` initCommand.Action(func() error { - logger.WhiteUnderline("Initialising project") + logger.PrintSmallBanner("Initialising project") fmt.Println() // Check if the system is initialised diff --git a/cmd/wails/4_build.go b/cmd/wails/4_build.go index e289cc77c..1fbaa439e 100644 --- a/cmd/wails/4_build.go +++ b/cmd/wails/4_build.go @@ -25,12 +25,12 @@ func init() { initCmd.Action(func() error { - log := cmd.NewLogger() message := "Building Application" if forceRebuild { message += " (force rebuild)" } - log.WhiteUnderline(message) + logger.PrintSmallBanner(message) + fmt.Println() // Project options projectOptions := &cmd.ProjectOptions{} diff --git a/cmd/wails/6_serve.go b/cmd/wails/6_serve.go index 01e89e87f..7be86582a 100644 --- a/cmd/wails/6_serve.go +++ b/cmd/wails/6_serve.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/leaanthony/spinner" "github.com/wailsapp/wails/cmd" ) @@ -17,12 +19,10 @@ func init() { BoolFlag("f", "Force rebuild of application components", &forceRebuild) initCmd.Action(func() error { - log := cmd.NewLogger() - message := "Building Application" - if forceRebuild { - message += " (force rebuild)" - } - log.WhiteUnderline(message) + + message := "Serving Application" + logger.PrintSmallBanner(message) + fmt.Println() // Project options projectOptions := &cmd.ProjectOptions{} diff --git a/cmd/wails/main.go b/cmd/wails/main.go index 62258d618..ae562209b 100644 --- a/cmd/wails/main.go +++ b/cmd/wails/main.go @@ -10,15 +10,8 @@ var logger = cmd.NewLogger() // Create main app var app = cmd.NewCli("wails", "A cli tool for building Wails applications.") -// Prints the cli banner -func printBanner(app *cmd.Cli) error { - logger.PrintBanner() - return nil -} - // Main! func main() { - app.PreRun(printBanner) err := app.Run() if err != nil { logger.Error(err.Error())