mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-25 12:24:47 +02:00
5fac40c129
In 5a3049485c we changed the execution of shell commands to use an interactive shell (-i), because this allows users to use aliases or shell functions, which is a nice convenience. Since then, however, many users have reported problems with lazygit not coming back to the foreground after executing a shell command. Some users report that appending "; exit" to the end of the command line solves this. I don't really understand what the cause of this problem was, or why appending "; exit" solves it, but if it helps, let's do it.
70 lines
1.7 KiB
Go
70 lines
1.7 KiB
Go
package oscommands
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/common"
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
)
|
|
|
|
// NewDummyOSCommand creates a new dummy OSCommand for testing
|
|
func NewDummyOSCommand() *OSCommand {
|
|
osCmd := NewOSCommand(utils.NewDummyCommon(), config.NewDummyAppConfig(), dummyPlatform, NewNullGuiIO(utils.NewDummyLog()))
|
|
|
|
return osCmd
|
|
}
|
|
|
|
type OSCommandDeps struct {
|
|
Common *common.Common
|
|
Platform *Platform
|
|
GetenvFn func(string) string
|
|
RemoveFileFn func(string) error
|
|
Cmd *CmdObjBuilder
|
|
TempDir string
|
|
}
|
|
|
|
func NewDummyOSCommandWithDeps(deps OSCommandDeps) *OSCommand {
|
|
common := deps.Common
|
|
if common == nil {
|
|
common = utils.NewDummyCommon()
|
|
}
|
|
|
|
platform := deps.Platform
|
|
if platform == nil {
|
|
platform = dummyPlatform
|
|
}
|
|
|
|
return &OSCommand{
|
|
Common: common,
|
|
Platform: platform,
|
|
getenvFn: deps.GetenvFn,
|
|
removeFileFn: deps.RemoveFileFn,
|
|
guiIO: NewNullGuiIO(utils.NewDummyLog()),
|
|
tempDir: deps.TempDir,
|
|
}
|
|
}
|
|
|
|
func NewDummyCmdObjBuilder(runner ICmdObjRunner) *CmdObjBuilder {
|
|
return &CmdObjBuilder{
|
|
runner: runner,
|
|
platform: dummyPlatform,
|
|
}
|
|
}
|
|
|
|
var dummyPlatform = &Platform{
|
|
OS: "darwin",
|
|
Shell: "bash",
|
|
InteractiveShell: "bash",
|
|
ShellArg: "-c",
|
|
InteractiveShellArg: "-i",
|
|
InteractiveShellExit: "; exit $?",
|
|
OpenCommand: "open {{filename}}",
|
|
OpenLinkCommand: "open {{link}}",
|
|
}
|
|
|
|
func NewDummyOSCommandWithRunner(runner *FakeCmdObjRunner) *OSCommand {
|
|
osCommand := NewOSCommand(utils.NewDummyCommon(), config.NewDummyAppConfig(), dummyPlatform, NewNullGuiIO(utils.NewDummyLog()))
|
|
osCommand.Cmd = NewDummyCmdObjBuilder(runner)
|
|
|
|
return osCommand
|
|
}
|