Changed signature of SubPipe

This commit is contained in:
Leon Mika 2023-04-24 05:07:33 +00:00
parent 8c7e9453ee
commit 1651987399

View file

@ -2,8 +2,9 @@ package scriptx
import ( import (
"bufio" "bufio"
"github.com/bitfield/script"
"io" "io"
"github.com/bitfield/script"
) )
func eachLine(r io.Reader, fn func(line string) error) error { func eachLine(r io.Reader, fn func(line string) error) error {
@ -16,11 +17,11 @@ func eachLine(r io.Reader, fn func(line string) error) error {
return scanner.Err() return scanner.Err()
} }
func SubPipe(fn func(src string) *script.Pipe) func(r io.Reader, w io.Writer) error { func SubPipe(fn func(src *script.Pipe) *script.Pipe) func(r io.Reader, w io.Writer) error {
return func(r io.Reader, w io.Writer) error { return func(r io.Reader, w io.Writer) error {
scanner := bufio.NewScanner(r) scanner := bufio.NewScanner(r)
for scanner.Scan() { for scanner.Scan() {
bts, err := fn(scanner.Text()).Bytes() bts, err := fn(script.Echo(scanner.Text())).Bytes()
if err != nil { if err != nil {
return err return err
} }