github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-30 06:37:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Don't store cmd stdout in string

Browse Source 
Storing the stdout confuses isatty causing programs running within
ShellMode to not format properly.

Fixes #862
This commit is contained in:
Zachary Yedidia
2017-10-06 21:09:53 -04:00
parent b7c99c52d2
commit 17dac164ea
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/micro/command.go
View File

@@ -3,7 +3,6 @@ package main
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io"
"os" "os"
"os/exec" "os/exec"
"os/signal" "os/signal"
@@ -661,10 +660,10 @@ func HandleShellCommand(input string, openTerm bool, waitToFinish bool) string {
args := SplitCommandArgs(input)[1:] args := SplitCommandArgs(input)[1:]
// Set up everything for the command // Set up everything for the command
var outputBuf bytes.Buffer var output string
cmd := exec.Command(inputCmd, args...) cmd := exec.Command(inputCmd, args...)
cmd.Stdin = os.Stdin cmd.Stdin = os.Stdin
cmd.Stdout = io.MultiWriter(os.Stdout, &outputBuf) cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
// This is a trap for Ctrl-C so that it doesn't kill micro // This is a trap for Ctrl-C so that it doesn't kill micro
@@ -680,7 +679,6 @@ func HandleShellCommand(input string, openTerm bool, waitToFinish bool) string {
cmd.Start() cmd.Start()
err := cmd.Wait() err := cmd.Wait()
output := outputBuf.String()
if err != nil { if err != nil {
output = err.Error() output = err.Error()
} }