mirror of
https://github.com/jesseduffield/lazydocker.git
synced 2026-07-22 15:11:02 +00:00
a0819d6b91
Changed FgBlue to FgCyan in multiple locations to improve text visibility on terminals with dark blue ANSI colors. This affects image history display, service status indicators, container states, keyboard shortcuts, and command output. Fixes #685
72 lines
1.5 KiB
Go
72 lines
1.5 KiB
Go
package gui
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/exec"
|
|
"os/signal"
|
|
"strings"
|
|
|
|
"github.com/fatih/color"
|
|
"github.com/jesseduffield/lazydocker/pkg/utils"
|
|
)
|
|
|
|
func (gui *Gui) runSubprocess(cmd *exec.Cmd) error {
|
|
return gui.runSubprocessWithMessage(cmd, "")
|
|
}
|
|
|
|
func (gui *Gui) runSubprocessWithMessage(cmd *exec.Cmd, msg string) error {
|
|
gui.Mutexes.SubprocessMutex.Lock()
|
|
defer gui.Mutexes.SubprocessMutex.Unlock()
|
|
|
|
if err := gui.g.Suspend(); err != nil {
|
|
return gui.createErrorPanel(err.Error())
|
|
}
|
|
|
|
gui.PauseBackgroundThreads = true
|
|
|
|
gui.runCommand(cmd, msg)
|
|
|
|
if err := gui.g.Resume(); err != nil {
|
|
return gui.createErrorPanel(err.Error())
|
|
}
|
|
|
|
gui.PauseBackgroundThreads = false
|
|
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) runCommand(cmd *exec.Cmd, msg string) {
|
|
cmd.Stdout = os.Stdout
|
|
cmd.Stderr = os.Stdout
|
|
cmd.Stdin = os.Stdin
|
|
|
|
stop := make(chan os.Signal, 1)
|
|
defer signal.Stop(stop)
|
|
|
|
go func() {
|
|
signal.Notify(stop, os.Interrupt)
|
|
<-stop
|
|
|
|
if err := gui.OSCommand.Kill(cmd); err != nil {
|
|
gui.Log.Error(err)
|
|
}
|
|
}()
|
|
|
|
fmt.Fprintf(os.Stdout, "\n%s\n\n", utils.ColoredString("+ "+strings.Join(cmd.Args, " "), color.FgCyan))
|
|
if msg != "" {
|
|
fmt.Fprintf(os.Stdout, "\n%s\n\n", utils.ColoredString(msg, color.FgGreen))
|
|
}
|
|
if err := cmd.Run(); err != nil {
|
|
// not handling the error explicitly because usually we're going to see it
|
|
// in the output anyway
|
|
gui.Log.Error(err)
|
|
}
|
|
|
|
cmd.Stdin = nil
|
|
cmd.Stdout = io.Discard
|
|
cmd.Stderr = io.Discard
|
|
|
|
gui.promptToReturn()
|
|
}
|