diff options
Diffstat (limited to 'goList.go')
| -rw-r--r-- | goList.go | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -2,6 +2,7 @@ package repostatus import ( "encoding/json" + "strings" "time" "go.wit.com/lib/gui/shell" @@ -88,11 +89,12 @@ func runGoList(url string) (string, error) { if err != nil { return "", err } - r := shell.Output("", []string{"go", "list", "-json", "-m", url + "@" + ver}) + r := shell.Run([]string{"go", "list", "-json", "-m", url + "@" + ver}) var modInfo Module - err = json.Unmarshal(r.Output, &modInfo) + out := strings.Join(r.Stdout, "\n") + err = json.Unmarshal([]byte(out), &modInfo) if err != nil { - log.Info("runGoList() r.Output =", string(r.Output)) + log.Info("runGoList() r.Output =", out) log.Info("runGoList() json.Unmarshal() error =", err) return "", err } @@ -101,11 +103,12 @@ func runGoList(url string) (string, error) { } func getLatestVersion(url string) (string, error) { - r := shell.Output("", []string{"go", "list", "-json", "-m", url + "@latest"}) + r := shell.Run([]string{"go", "list", "-json", "-m", url + "@latest"}) var modInfo Module - err := json.Unmarshal(r.Output, &modInfo) + out := strings.Join(r.Stdout, "\n") + err := json.Unmarshal([]byte(out), &modInfo) if err != nil { - log.Info("runGoList() r.Output =", string(r.Output)) + log.Info("runGoList() r.Output =", out) log.Info("runGoList() json.Unmarshal() error =", err) return "", err } |