mbk-lab
/
wide
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🎨 修复编译问题

This commit is contained in:
Liang Ding 2019-05-16 10:53:03 +08:00
parent efcceccac4
commit 88f16e1057
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
output/build.go
View File

@ -95,7 +95,7 @@ func BuildHandler(w http.ResponseWriter, r *http.Request) {
} }
goBuildArgs := []string{} goBuildArgs := []string{}
goBuildArgs = append(goBuildArgs, "build") goBuildArgs = append(goBuildArgs, "build", "-i")
goBuildArgs = append(goBuildArgs, user.BuildArgs(runtime.GOOS)...) goBuildArgs = append(goBuildArgs, user.BuildArgs(runtime.GOOS)...)
cmd := exec.Command("go", goBuildArgs...) cmd := exec.Command("go", goBuildArgs...)
@ -196,7 +196,7 @@ func BuildHandler(w http.ResponseWriter, r *http.Request) {
}() }()
errReader := bufio.NewReader(stderr) errReader := bufio.NewReader(stderr)
lines := []string{} var lines []string
for { for {
wsChannel := session.OutputWS[sid] wsChannel := session.OutputWS[sid]
if nil == wsChannel { if nil == wsChannel {
@ -232,20 +232,6 @@ func BuildHandler(w http.ResponseWriter, r *http.Request) {
if nil == cmd.Wait() { if nil == cmd.Wait() {
channelRet["nextCmd"] = args["nextCmd"] channelRet["nextCmd"] = args["nextCmd"]
channelRet["output"] = "<span class='build-succ'>" + i18n.Get(locale, "build-succ").(string) + "</span>\n" channelRet["output"] = "<span class='build-succ'>" + i18n.Get(locale, "build-succ").(string) + "</span>\n"
go func() { // go install, for subsequent gocode lib-path
defer util.Recover()
cmd := exec.Command("go", "install")
cmd.Dir = curDir
setCmdEnv(cmd, username)
out, _ := cmd.CombinedOutput()
if len(out) > 0 {
logger.Warn(string(out))
}
}()
} else { } else {
channelRet["output"] = "<span class='build-error'>" + i18n.Get(locale, "build-error").(string) + "</span>\n" channelRet["output"] = "<span class='build-error'>" + i18n.Get(locale, "build-error").(string) + "</span>\n"