From c52438956cba35f9b58f467b7da16d23e58297bd Mon Sep 17 00:00:00 2001 From: surdeus Date: Sun, 4 Jun 2023 23:41:43 +0300 Subject: [PATCH] Something finally works. --- src/tool/run/anko.go | 28 ++++++++++++++++++---------- src/tool/run/test.anko | 4 +++- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/tool/run/anko.go b/src/tool/run/anko.go index ce8bd18..89b5b9e 100644 --- a/src/tool/run/anko.go +++ b/src/tool/run/anko.go @@ -21,9 +21,9 @@ import ( ) type Cmd struct { - input io.Reader + input io.ReadCloser *exec.Cmd - output io.Writer + output io.WriteCloser } const version = "0.1.8" @@ -109,13 +109,15 @@ func setupEnv() { panic(err) } - ibuf := make([]byte, 512) obuf := make([]byte, 512) - go func() { + var ( + err error + n int + ) for { - no, err := stdout.Read(obuf) - output.Write(obuf[:no]) + n, err = stdout.Read(obuf) + output.Write(obuf[:n]) if err == io.EOF { break } else if err != nil { @@ -125,10 +127,15 @@ func setupEnv() { stdout.Close() }() + ibuf := make([]byte, 512) go func() { + var ( + err error + n int + ) for { - ni, err := input.Read(ibuf) - stdin.Write(ibuf[:ni]) + n, err = input.Read(ibuf) + stdin.Write(ibuf[:n]) if err == io.EOF { break } else if err != nil { @@ -140,10 +147,11 @@ func setupEnv() { err = rcmd.Wait() if err != nil { - fmt.Println("shit", err) + //fmt.Println(err) + return false } - return err == nil + return true }) core.Import(e) } diff --git a/src/tool/run/test.anko b/src/tool/run/test.anko index 2979faa..e3db13e 100644 --- a/src/tool/run/test.anko +++ b/src/tool/run/test.anko @@ -1,3 +1,5 @@ -rcmd("dir") +if rcmd("ls") { + rcmd("goblin", "echo", "full shit") +}