mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-14 11:23:09 +02:00
63 lines
1.9 KiB
Go
63 lines
1.9 KiB
Go
package gui
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
|
)
|
|
|
|
// Currently there is a bug where if we switch to a subprocess from within
|
|
// WithWaitingStatus we get stuck there and can't return to lazygit. We could
|
|
// fix this bug, or just stop running subprocesses from within there, given that
|
|
// we don't need to see a loading status if we're in a subprocess.
|
|
func (gui *Gui) withGpgHandling(cmdStr string, waitingStatus string, onSuccess func() error) error {
|
|
useSubprocess := gui.GitCommand.UsingGpg()
|
|
if useSubprocess {
|
|
// Need to remember why we use the shell for the subprocess but not in the other case
|
|
// Maybe there's no good reason
|
|
success, err := gui.runSubprocessWithSuspense(gui.OSCommand.ShellCommandFromString(cmdStr))
|
|
if success && onSuccess != nil {
|
|
if err := onSuccess(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if err := gui.refreshSidePanels(refreshOptions{mode: ASYNC}); err != nil {
|
|
return err
|
|
}
|
|
|
|
return err
|
|
} else {
|
|
return gui.RunAndStream(cmdStr, waitingStatus, onSuccess)
|
|
}
|
|
}
|
|
|
|
func (gui *Gui) RunAndStream(cmdStr string, waitingStatus string, onSuccess func() error) error {
|
|
return gui.WithWaitingStatus(waitingStatus, func() error {
|
|
cmd := gui.OSCommand.ShellCommandFromString(cmdStr)
|
|
cmd.Env = append(cmd.Env, "TERM=dumb")
|
|
cmdWriter := gui.getCmdWriter()
|
|
cmd.Stdout = cmdWriter
|
|
cmd.Stderr = cmdWriter
|
|
|
|
if err := cmd.Run(); err != nil {
|
|
if _, err := cmd.Stdout.Write([]byte(fmt.Sprintf("%s\n", style.FgRed.Sprint(err.Error())))); err != nil {
|
|
gui.Log.Error(err)
|
|
}
|
|
_ = gui.refreshSidePanels(refreshOptions{mode: ASYNC})
|
|
return gui.surfaceError(
|
|
fmt.Errorf(
|
|
gui.Tr.GitCommandFailed, gui.Config.GetUserConfig().Keybinding.Universal.ExtrasMenu,
|
|
),
|
|
)
|
|
}
|
|
|
|
if onSuccess != nil {
|
|
if err := onSuccess(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
|
|
})
|
|
}
|