diff options
author | mjarkk <mkopenga@gmail.com> | 2018-10-27 14:35:07 +0200 |
---|---|---|
committer | mjarkk <mkopenga@gmail.com> | 2018-10-27 14:35:07 +0200 |
commit | e47c597b3a2d1101984bd7f402a0ca761fbf7169 (patch) | |
tree | c5be3a50024315ba4fd4fe9b233bb8c396f6c862 /pkg/commands | |
parent | ac03665df34e8be89672fb98e202b182d745fdaf (diff) |
Made it possible to build again for windows
Diffstat (limited to 'pkg/commands')
-rw-r--r-- | pkg/commands/exec_live_default.go | 57 | ||||
-rw-r--r-- | pkg/commands/exec_live_win.go | 8 | ||||
-rw-r--r-- | pkg/commands/os.go | 46 |
3 files changed, 67 insertions, 44 deletions
diff --git a/pkg/commands/exec_live_default.go b/pkg/commands/exec_live_default.go new file mode 100644 index 000000000..41ce3a995 --- /dev/null +++ b/pkg/commands/exec_live_default.go @@ -0,0 +1,57 @@ +// +build !windows + +package commands + +import ( + "bufio" + "os/exec" + "regexp" + + "github.com/ionrock/procs" + "github.com/kr/pty" + "github.com/mgutz/str" +) + +// RunCommandWithOutputLiveWrapper runs a command and return every word that gets written in stdout +// Output is a function that executes by every word that gets read by bufio +// As return of output you need to give a string that will be written to stdin +// NOTE: If the return data is empty it won't written anything to stdin +// NOTE: You don't have to include a enter in the return data this function will do that for you +func RunCommandWithOutputLiveWrapper(c *OSCommand, command string, output func(string) string) error { + splitCmd := str.ToArgv(command) + cmd := exec.Command(splitCmd[0], splitCmd[1:]...) + + cmd.Env = procs.Env(map[string]string{ + "LANG": "en_US.utf8", + "LC_ALL": "en_US.UTF-8", + }, true) + + tty, err := pty.Start(cmd) + + if err != nil { + return err + } + + defer func() { _ = tty.Close() }() + + go func() { + // Regex to cleanup the command output + // sometimes the output words include unneeded spaces at eatch end of the string + re := regexp.MustCompile(`(^\s*)|(\s*$)`) + + scanner := bufio.NewScanner(tty) + scanner.Split(bufio.ScanWords) + for scanner.Scan() { + toWrite := output(re.ReplaceAllString(scanner.Text(), "")) + if len(toWrite) > 0 { + _, _ = tty.Write([]byte(toWrite + "\n")) + } + } + }() + + if err := cmd.Wait(); err != nil { + return err + } + + return nil +} diff --git a/pkg/commands/exec_live_win.go b/pkg/commands/exec_live_win.go new file mode 100644 index 000000000..419eef5f2 --- /dev/null +++ b/pkg/commands/exec_live_win.go @@ -0,0 +1,8 @@ +// +build windows + +package commands + +// RunCommandWithOutputLiveWrapper runs a command live but because of windows compatibility this command can't be ran there +func RunCommandWithOutputLiveWrapper(c *OSCommand, command string, output func(string) string) error { + return c.RunCommand(command) +} diff --git a/pkg/commands/os.go b/pkg/commands/os.go index 7bd714157..e99ffbbb7 100644 --- a/pkg/commands/os.go +++ b/pkg/commands/os.go @@ -1,17 +1,14 @@ package commands import ( - "bufio" "errors" "os" "os/exec" "regexp" "strings" - "github.com/ionrock/procs" "github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/utils" - "github.com/kr/pty" "github.com/mgutz/str" @@ -61,48 +58,9 @@ func (c *OSCommand) RunCommandWithOutput(command string) (string, error) { ) } -// RunCommandWithOutputLive runs a command and return every word that gets written in stdout -// Output is a function that executes by every word that gets read by bufio -// As return of output you need to give a string that will be written to stdin -// NOTE: If the return data is empty it won't written anything to stdin -// NOTE: You don't have to include a enter in the return data this function will do that for you +// RunCommandWithOutputLive runs RunCommandWithOutputLiveWrapper func (c *OSCommand) RunCommandWithOutputLive(command string, output func(string) string) error { - splitCmd := str.ToArgv(command) - cmd := exec.Command(splitCmd[0], splitCmd[1:]...) - - cmd.Env = procs.Env(map[string]string{ - "LANG": "en_US.utf8", - "LC_ALL": "en_US.UTF-8", - }, true) - - tty, err := pty.Start(cmd) - - if err != nil { - return err - } - - defer func() { _ = tty.Close() }() - - go func() { - // Regex to cleanup the command output - // sometimes the output words include unneeded spaces at eatch end of the string - re := regexp.MustCompile(`(^\s*)|(\s*$)`) - - scanner := bufio.NewScanner(tty) - scanner.Split(bufio.ScanWords) - for scanner.Scan() { - toWrite := output(re.ReplaceAllString(scanner.Text(), "")) - if len(toWrite) > 0 { - _, _ = tty.Write([]byte(toWrite + "\n")) - } - } - }() - - if err := cmd.Wait(); err != nil { - return err - } - - return nil + return RunCommandWithOutputLiveWrapper(c, command, output) } // DetectUnamePass detect a username / password question in a command |