From a300172adce2b14d36da565686de11cb2098aa19 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sun, 30 May 2021 09:41:47 +1000 Subject: [PATCH] [windows] Better wails doctor installation details --- v2/cmd/wails/internal/commands/doctor/doctor.go | 6 +++--- v2/internal/system/packagemanager/pm.go | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/v2/cmd/wails/internal/commands/doctor/doctor.go b/v2/cmd/wails/internal/commands/doctor/doctor.go index 309825c2..f61a6a20 100644 --- a/v2/cmd/wails/internal/commands/doctor/doctor.go +++ b/v2/cmd/wails/internal/commands/doctor/doctor.go @@ -36,7 +36,6 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { w.Init(os.Stdout, 8, 8, 0, '\t', 0) // Write out the system information - fmt.Fprintf(w, "\n") fmt.Fprintf(w, "System\n") fmt.Fprintf(w, "------\n") fmt.Fprintf(w, "%s\t%s\n", "OS:", info.OS.Name) @@ -117,14 +116,15 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { if len(dependenciesMissing) == 0 && dependenciesAvailableRequired == 0 { logger.Println("Your system is ready for Wails development!") + logger.Println("") } if dependenciesAvailableRequired != 0 { - logger.Println("Install required packages using: " + info.Dependencies.InstallAllRequiredCommand()) + logger.Println("Required package(s) installation details: \n" + info.Dependencies.InstallAllRequiredCommand()) } if dependenciesAvailableOptional != 0 { - logger.Println("Install optional packages using: " + info.Dependencies.InstallAllOptionalCommand()) + logger.Println("Optional package(s) installation details: \n" + info.Dependencies.InstallAllOptionalCommand()) } if len(externalPackages) > 0 { diff --git a/v2/internal/system/packagemanager/pm.go b/v2/internal/system/packagemanager/pm.go index 999b451c..e5a3eaff 100644 --- a/v2/internal/system/packagemanager/pm.go +++ b/v2/internal/system/packagemanager/pm.go @@ -21,7 +21,6 @@ type PackageManager interface { InstallCommand(*Package) string } - // Dependancy represents a system package that we require type Dependancy struct { Name string @@ -36,7 +35,6 @@ type Dependancy struct { // DependencyList is a list of Dependency instances type DependencyList []*Dependancy - // InstallAllRequiredCommand returns the command you need to use to install all required dependencies func (d DependencyList) InstallAllRequiredCommand() string { @@ -64,7 +62,7 @@ func (d DependencyList) InstallAllOptionalCommand() string { if dependency.PackageName != "" { if !dependency.Installed && dependency.Optional { if result == "" { - result = dependency.InstallCommand + result = " - " + dependency.Name + ": " + dependency.InstallCommand + "\n" } else { result += " " + dependency.PackageName } @@ -74,4 +72,3 @@ func (d DependencyList) InstallAllOptionalCommand() string { return result } -