exec shell: fix shell config

Currently each time when ctop started it overwrites "shell" config with default value of program argument.
This means that in fact default shell config is never worked at all.
This commit is contained in:
Sergey Ponomarev 2020-11-20 10:31:00 +02:00
parent ddfff03c05
commit 7679d4a7fd
2 changed files with 3 additions and 3 deletions

View File

@ -46,7 +46,7 @@ func main() {
invertFlag = flag.Bool("i", false, "invert default colors")
scaleCpu = flag.Bool("scale-cpu", false, "show cpu as % of system total")
connectorFlag = flag.String("connector", "docker", "container connector to use")
defaultShell = flag.String("shell", "sh", "exec shell to use")
defaultShell = flag.String("shell", "", "exec shell to use")
)
flag.Parse()

View File

@ -359,8 +359,8 @@ func ExecShell() MenuFn {
ui.DefaultEvtStream.ResetHandlers()
defer ui.DefaultEvtStream.ResetHandlers()
shell := config.Get("shell")
if err := c.Exec([]string{shell.Val, "-c", "printf '\\e[0m\\e[?25h' && clear && " + shell.Val}); err != nil {
shell := config.GetVal("shell")
if err := c.Exec([]string{shell, "-c", "printf '\\e[0m\\e[?25h' && clear && " + shell}); err != nil {
log.Fatal(err)
}