mirror of https://github.com/Hilbis/Hilbish
refactor: set runner options in a better way and move out exec handler
parent
69d38d7048
commit
9ce861b080
65
exec.go
65
exec.go
|
@ -159,15 +159,45 @@ func execCommand(cmd string, terminalOut bool) (io.Writer, io.Writer, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
var stdout io.Writer = os.Stdout
|
|
||||||
var stderr io.Writer = os.Stderr
|
runner, _ := interp.New()
|
||||||
if !terminalOut {
|
|
||||||
|
var stdout io.Writer
|
||||||
|
var stderr io.Writer
|
||||||
|
if terminalOut {
|
||||||
|
interp.StdIO(os.Stdin, os.Stdout, os.Stderr)(runner)
|
||||||
|
} else {
|
||||||
stdout = new(bytes.Buffer)
|
stdout = new(bytes.Buffer)
|
||||||
stderr = new(bytes.Buffer)
|
stderr = new(bytes.Buffer)
|
||||||
|
interp.StdIO(os.Stdin, stdout, stderr)(runner)
|
||||||
}
|
}
|
||||||
|
buf := new(bytes.Buffer)
|
||||||
|
printer := syntax.NewPrinter()
|
||||||
|
|
||||||
var bg bool
|
var bg bool
|
||||||
exechandle := func(ctx context.Context, args []string) error {
|
for _, stmt := range file.Stmts {
|
||||||
|
bg = false
|
||||||
|
if stmt.Background {
|
||||||
|
bg = true
|
||||||
|
printer.Print(buf, stmt.Cmd)
|
||||||
|
|
||||||
|
stmtStr := buf.String()
|
||||||
|
buf.Reset()
|
||||||
|
jobs.add(stmtStr)
|
||||||
|
}
|
||||||
|
|
||||||
|
interp.ExecHandler(execHandle(bg))(runner)
|
||||||
|
err = runner.Run(context.TODO(), stmt)
|
||||||
|
if err != nil {
|
||||||
|
return stdout, stderr, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return stdout, stderr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func execHandle(bg bool) interp.ExecHandlerFunc {
|
||||||
|
return func(ctx context.Context, args []string) error {
|
||||||
_, argstring := splitInput(strings.Join(args, " "))
|
_, argstring := splitInput(strings.Join(args, " "))
|
||||||
// i dont really like this but it works
|
// i dont really like this but it works
|
||||||
if aliases.All()[args[0]] != "" {
|
if aliases.All()[args[0]] != "" {
|
||||||
|
@ -328,33 +358,6 @@ func execCommand(cmd string, terminalOut bool) (io.Writer, io.Writer, error) {
|
||||||
}
|
}
|
||||||
return interp.NewExitStatus(exit)
|
return interp.NewExitStatus(exit)
|
||||||
}
|
}
|
||||||
|
|
||||||
runner, _ := interp.New(
|
|
||||||
interp.StdIO(os.Stdin, stdout, stderr),
|
|
||||||
interp.ExecHandler(exechandle),
|
|
||||||
)
|
|
||||||
|
|
||||||
buf := new(bytes.Buffer)
|
|
||||||
printer := syntax.NewPrinter()
|
|
||||||
|
|
||||||
for _, stmt := range file.Stmts {
|
|
||||||
bg = false
|
|
||||||
if stmt.Background {
|
|
||||||
bg = true
|
|
||||||
printer.Print(buf, stmt.Cmd)
|
|
||||||
|
|
||||||
stmtStr := buf.String()
|
|
||||||
buf.Reset()
|
|
||||||
jobs.add(stmtStr)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = runner.Run(context.TODO(), stmt)
|
|
||||||
if err != nil {
|
|
||||||
return stdout, stderr, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return stdout, stderr, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func lookpath(file string) error { // custom lookpath function so we know if a command is found *and* is executable
|
func lookpath(file string) error { // custom lookpath function so we know if a command is found *and* is executable
|
||||||
|
|
Loading…
Reference in New Issue