Merge branch 'FixRunBackgroundShell' into dev

Author: Neko-Box-Coder

README.md

@@ -15,7 +15,8 @@
 > - [Adding auto complete support for multi cursors #3442](https://github.com/zyedidia/micro/pull/3442)
 > - [Fixing comment plugin not using user settings when overriding default setting #3424](https://github.com/zyedidia/micro/pull/3424)
 > - [Add the ability lock settings.json and bindings.json for plugins #3618](https://github.com/zyedidia/micro/pull/3618)
-> - [Adding error screen for lua functions running in status line #3691 ](https://github.com/zyedidia/micro/pull/3691)
+> - [Adding error screen for lua functions running in status line #3691](https://github.com/zyedidia/micro/pull/3691)
+> - [Adding lua function to use result of RunBackgroundShell #3692](https://github.com/zyedidia/micro/pull/3692)
 >
 > To see the diff between this and upstream master, click [here](https://github.com/zyedidia/micro/compare/master...Neko-Box-Coder:micro-dev:dev)
 

cmd/micro/initlua.go

@@ -101,6 +101,25 @@ func luaImportMicroShell() *lua.LTable {
 	ulua.L.SetField(pkg, "ExecCommand", luar.New(ulua.L, shell.ExecCommand))
 	ulua.L.SetField(pkg, "RunCommand", luar.New(ulua.L, shell.RunCommand))
 	ulua.L.SetField(pkg, "RunBackgroundShell", luar.New(ulua.L, shell.RunBackgroundShell))
+	ulua.L.SetField(pkg, "LaunchBackgroundShellFunc", luar.New(ulua.L, func(f func() (string, error), cb func(string, error)) {
+		go func() {
+			output, runErr := f()
+			if cb != nil {
+				wrapperFunc := func(output string, args []interface{}) {
+					errVal, ok := args[0].(error)
+					if ok {
+						cb(output, errVal)
+					} else {
+						cb(output, nil)
+					}
+				}
+				var passArgs []interface{}
+				passArgs = append(passArgs, runErr)
+				jobFunc := shell.JobFunction{wrapperFunc, output, passArgs}
+				shell.Jobs <- jobFunc
+			}
+		}()
+	}))
 	ulua.L.SetField(pkg, "RunInteractiveShell", luar.New(ulua.L, shell.RunInteractiveShell))
 	ulua.L.SetField(pkg, "JobStart", luar.New(ulua.L, shell.JobStart))
 	ulua.L.SetField(pkg, "JobSpawn", luar.New(ulua.L, shell.JobSpawn))

internal/action/command.go

@@ -857,12 +857,17 @@ func (h *BufPane) UnbindCmd(args []string) {
 
 // RunCmd runs a shell command in the background
 func (h *BufPane) RunCmd(args []string) {
-	runf, err := shell.RunBackgroundShell(shellquote.Join(args...))
+	runCmd := shellquote.Join(args...)
+	runf, err := shell.RunBackgroundShell(runCmd)
 	if err != nil {
 		InfoBar.Error(err)
 	} else {
 		go func() {
-			InfoBar.Message(runf())
+			output, runErr := runf()
+			if runErr != nil {
+				output = fmt.Sprint(runCmd, " exited with error: ", err)
+			}
+			InfoBar.Message(output)
 			screen.Redraw()
 		}()
 	}

internal/shell/job.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"io"
 	"os/exec"
+	"runtime"
 )
 
 var Jobs chan JobFunction
@@ -54,7 +55,11 @@ func (f *CallbackFile) Write(data []byte) (int, error) {
 // JobStart starts a shell command in the background with the given callbacks
 // It returns an *exec.Cmd as the job id
 func JobStart(cmd string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *Job {
-	return JobSpawn("sh", []string{"-c", cmd}, onStdout, onStderr, onExit, userargs...)
+	if runtime.GOOS == "windows" {
+		return JobSpawn("cmd", []string{"/v:on", "/c", cmd}, onStdout, onStderr, onExit, userargs...)
+	} else {
+		return JobSpawn("sh", []string{"-c", cmd}, onStdout, onStderr, onExit, userargs...)
+	}
 }
 
 // JobSpawn starts a process with args in the background with the given callbacks

internal/shell/shell.go

@@ -3,7 +3,6 @@ package shell
 import (
 	"bytes"
 	"errors"
-	"fmt"
 	"io"
 	"os"
 	"os/exec"
@@ -48,23 +47,16 @@ func RunCommand(input string) (string, error) {
 // RunBackgroundShell runs a shell command in the background
 // It returns a function which will run the command and returns a string
 // message result
-func RunBackgroundShell(input string) (func() string, error) {
+func RunBackgroundShell(input string) (func() (string, error), error) {
 	args, err := shellquote.Split(input)
 	if err != nil {
 		return nil, err
 	}
 	if len(args) == 0 {
 		return nil, errors.New("No arguments")
 	}
-	inputCmd := args[0]
-	return func() string {
-		output, err := RunCommand(input)
-
-		str := output
-		if err != nil {
-			str = fmt.Sprint(inputCmd, " exited with error: ", err, ": ", output)
-		}
-		return str
+	return func() (string, error) {
+		return RunCommand(input)
 	}, nil
 }
 

runtime/help/plugins.md

@@ -249,9 +249,13 @@ The packages and their contents are listed below (in Go type signatures):
        two arguments in the `ExecCommand` argument list (quoting arguments
        will preserve spaces).
 
-    - `RunBackgroundShell(input string) (func() string, error)`: returns a
+    - `RunBackgroundShell(input string) (func() (string, error), error)`: returns a
        function that will run the given shell command and return its output.
 
+    - `LaunchBackgroundShellFunc(f func() (string, error), cb func(string, error))`: Runs
+       the returned function from `RunBackgroundShell` in the background. The output and
+       erorr of such function will be passed to the callback.
+
     - `RunInteractiveShell(input string, wait bool, getOutput bool)
                           (string, error)`:
        temporarily closes micro and runs the given command in the terminal.