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

Improve shell commands

Browse Source
This commit is contained in:
Zachary Yedidia
2018-01-22 17:20:03 -05:00
parent 4f41881c10
commit 0a49ea0a0d
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/micro/shell.go
View File

@@ -65,10 +65,10 @@ func RunBackgroundShell(input string) {
}()
}
func RunInteractiveShell(input string, wait bool, getOutput bool) string {
func RunInteractiveShell(input string, wait bool, getOutput bool) (string, error) {
args, err := shellwords.Split(input)
if err != nil {
return ""
return "", err
}
inputCmd := args[0]
@@ -103,9 +103,6 @@ func RunInteractiveShell(input string, wait bool, getOutput bool) string {
err = cmd.Wait()
output := outputBytes.String()
if err != nil {
output = err.Error()
}
if wait {
// This is just so we don't return right away and let the user press enter to return
@@ -115,7 +112,7 @@ func RunInteractiveShell(input string, wait bool, getOutput bool) string {
// Start the screen back up
InitScreen()
return output
return output, err
}
// HandleShellCommand runs the shell command