From 6e81a36adaca544cf4f1649367b29bb24e3ee3e4 Mon Sep 17 00:00:00 2001 From: bh90210 Date: Tue, 30 Jul 2019 02:02:01 +0300 Subject: [PATCH] linux working --- cmd/wails/9_issue.go | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/cmd/wails/9_issue.go b/cmd/wails/9_issue.go index ed7356797..a4c64c7e8 100644 --- a/cmd/wails/9_issue.go +++ b/cmd/wails/9_issue.go @@ -6,6 +6,7 @@ import ( "net/http" "net/url" "os" + "os/exec" "runtime" "strings" @@ -46,22 +47,29 @@ To help you in this process, we will ask for some information, add Go/Wails deta program := cmd.NewProgramHelper() var gccVersion, nodeVersion, npmVersion string - gcc := program.FindProgram("gcc") - if gcc != nil { - stdout, _, _, _ := gcc.Run("--version") - gccVersion = stdout - } + //gcc := program.FindProgram("gcc") + //if gcc != nil { + // stdout, _, _, _ := gcc.Run("--version", "|", "sed", "'s/[^0-9.]*\\([0-9.]*\\).*/\\1/'", "|", "grep", "-m1", "''") + // gccVersion = stdout + //} + + gccCmd := "gcc --version | sed 's/[^0-9.]*\\([0-9.]*\\).*/\\1/' | grep -m1 ''" + gcc, _ := exec.Command("bash", "-c", gccCmd).Output() + gccVersion = string(gcc) + gccVersion = gccVersion[:len(gccVersion)-1] npm := program.FindProgram("npm") if npm != nil { stdout, _, _, _ := npm.Run("--version") nodeVersion = stdout + nodeVersion = nodeVersion[:len(nodeVersion)-1] } node := program.FindProgram("node") if node != nil { stdout, _, _, _ := node.Run("--version") npmVersion = stdout + npmVersion = npmVersion[:len(npmVersion)-1] } str.WriteString("\n| Name | Value |\n| ----- | ----- |\n") @@ -70,9 +78,9 @@ To help you in this process, we will ask for some information, add Go/Wails deta str.WriteString(fmt.Sprintf("| Platform | %s |\n", runtime.GOOS)) str.WriteString(fmt.Sprintf("| Arch | %s |\n", runtime.GOARCH)) str.WriteString(fmt.Sprintf("| GO111MODULE | %s |\n", gomodule)) - str.WriteString(fmt.Sprintf("| Gcc | %s |\n", gccVersion)) - str.WriteString(fmt.Sprintf("| Npm | %s |\n", npmVersion)) - str.WriteString(fmt.Sprintf("| Node | %s |\n", nodeVersion)) + str.WriteString(fmt.Sprintf("| GCC | %s |\n", gccVersion)) + str.WriteString(fmt.Sprintf("| Npm | %s |\n", npmVersion)) + str.WriteString(fmt.Sprintf("| Node | %s |\n", nodeVersion)) fmt.Println() fmt.Println("Processing template and preparing for upload.")