From 3a7514bbdc9e06c3d9993c30afe8f2324be9037c Mon Sep 17 00:00:00 2001 From: bh90210 Date: Wed, 31 Jul 2019 02:54:59 +0300 Subject: [PATCH 1/2] fix: issue report --- cmd/wails/9_issue.go | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/cmd/wails/9_issue.go b/cmd/wails/9_issue.go index 3bc77977..90df6551 100644 --- a/cmd/wails/9_issue.go +++ b/cmd/wails/9_issue.go @@ -42,10 +42,12 @@ To help you in this process, we will ask for some information, add Go/Wails deta gomodule = "(Not Set)" } - // Get versions for GCC, node & npm + // get version numbers for GCC, node & npm program := cmd.NewProgramHelper() + // string helpers var gccVersion, nodeVersion, npmVersion string + // choose between OS (mac,linux,win) switch runtime.GOOS { case "darwin": gcc := program.FindProgram("gcc") @@ -54,11 +56,23 @@ To help you in this process, we will ask for some information, add Go/Wails deta gccVersion = strings.TrimSpace(stdout) } case "linux": - gcc := program.FindProgram("gcc") - if gcc != nil { - gccVersion, _, _, _ := gcc.Run("-dumpfullversion") - gccVersion = gccVersion[:len(gccVersion)-1] - gccVersion = strings.TrimSpace(gccVersion) + // for linux we have to + // collect distribution name + distro := cmd.GetLinuxDistroInfo() + // and use it as a nested switch + switch distro.ID { + default: // most supported distros are printing the right result with just 'gcc -dumpversion' + gcc := program.FindProgram("gcc") + if gcc != nil { + stdout, _, _, _ := gcc.Run("-dumpversion") + gccVersion = strings.TrimSpace(stdout) + } + case "fedora", "ubuntu": // except fedora & ubuntu that require 'gcc -dumpfullversion' + gcc := program.FindProgram("gcc") + if gcc != nil { + stdout, _, _, _ := gcc.Run("-dumpfullversion") + gccVersion = strings.TrimSpace(stdout) + } } // TODO: windows support From f4f04f21995711388ca632163f4b2ea0d986bd83 Mon Sep 17 00:00:00 2001 From: bh90210 Date: Wed, 31 Jul 2019 03:20:08 +0300 Subject: [PATCH 2/2] fix: typo --- cmd/wails/9_issue.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/wails/9_issue.go b/cmd/wails/9_issue.go index 90df6551..24d7f64d 100644 --- a/cmd/wails/9_issue.go +++ b/cmd/wails/9_issue.go @@ -56,10 +56,10 @@ To help you in this process, we will ask for some information, add Go/Wails deta gccVersion = strings.TrimSpace(stdout) } case "linux": - // for linux we have to - // collect distribution name + // for linux we have to collect + // the distribution name distro := cmd.GetLinuxDistroInfo() - // and use it as a nested switch + // and use it as nested switch switch distro.ID { default: // most supported distros are printing the right result with just 'gcc -dumpversion' gcc := program.FindProgram("gcc")