go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-23 00:39:13 +02:00
Code Issues Releases Activity

extract dependencies

Browse Source
This commit is contained in:
Anthony HAMON
2018-08-22 22:31:35 +02:00
parent 0b07cd19f7
commit 75e08993ea
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/commands/os.go
View File

@ -24,15 +24,21 @@ type Platform struct {
// OSCommand holds all the os commands // OSCommand holds all the os commands
type OSCommand struct { type OSCommand struct {
Log *logrus.Logger Log *logrus.Logger
Platform *Platform Platform *Platform
command func(string, ...string) *exec.Cmd
getGlobalGitConfig func(string) (string, error)
getenv func(string) string
} }
// NewOSCommand os command runner // NewOSCommand os command runner
func NewOSCommand(log *logrus.Logger) *OSCommand { func NewOSCommand(log *logrus.Logger) *OSCommand {
return &OSCommand{ return &OSCommand{
Log: log, Log: log,
Platform: getPlatform(), Platform: getPlatform(),
command: exec.Command,
getGlobalGitConfig: gitconfig.Global,
getenv: os.Getenv,
} }
} }
@ -43,7 +49,7 @@ func (c *OSCommand) RunCommandWithOutput(command string) (string, error) {
c.Log.Info(splitCmd) c.Log.Info(splitCmd)
return sanitisedCommandOutput( return sanitisedCommandOutput(
exec.Command(splitCmd[0], splitCmd[1:]...).CombinedOutput(), c.command(splitCmd[0], splitCmd[1:]...).CombinedOutput(),
) )
} }
@ -84,6 +90,7 @@ func (c *OSCommand) getOpenCommand() (string, string, error) {
"cygstart": "", "cygstart": "",
"open": "", "open": "",
} }
for name, trail := range trailMap { for name, trail := range trailMap {
if err := c.RunCommand("which " + name); err == nil { if err := c.RunCommand("which " + name); err == nil {
return name, trail, nil return name, trail, nil
@ -120,13 +127,13 @@ func (c *OSCommand) OpenFile(filename string) error {
// EditFile opens a file in a subprocess using whatever editor is available, // EditFile opens a file in a subprocess using whatever editor is available,
// falling back to core.editor, VISUAL, EDITOR, then vi // falling back to core.editor, VISUAL, EDITOR, then vi
func (c *OSCommand) EditFile(filename string) (*exec.Cmd, error) { func (c *OSCommand) EditFile(filename string) (*exec.Cmd, error) {
editor, _ := gitconfig.Global("core.editor") editor, _ := c.getGlobalGitConfig("core.editor")
if editor == "" { if editor == "" {
editor = os.Getenv("VISUAL") editor = c.getenv("VISUAL")
} }
if editor == "" { if editor == "" {
editor = os.Getenv("EDITOR") editor = c.getenv("EDITOR")
} }
if editor == "" { if editor == "" {
if err := c.RunCommand("which vi"); err == nil { if err := c.RunCommand("which vi"); err == nil {
@ -142,7 +149,7 @@ func (c *OSCommand) EditFile(filename string) (*exec.Cmd, error) {
// PrepareSubProcess iniPrepareSubProcessrocess then tells the Gui to switch to it // PrepareSubProcess iniPrepareSubProcessrocess then tells the Gui to switch to it
func (c *OSCommand) PrepareSubProcess(cmdName string, commandArgs ...string) *exec.Cmd { func (c *OSCommand) PrepareSubProcess(cmdName string, commandArgs ...string) *exec.Cmd {
return exec.Command(cmdName, commandArgs...) return c.command(cmdName, commandArgs...)
} }
// Quote wraps a message in platform-specific quotation marks // Quote wraps a message in platform-specific quotation marks