go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-04-25 12:25:07 +02:00
Code Issues Releases Activity

refactor: simplify some controls

Browse Source
This commit is contained in:
Andrey Nering 2017-07-08 15:08:44 -03:00
parent 6e880c9027
commit 0da130ee2c
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
execext/exec.go
View File

@ -46,8 +46,5 @@ func RunCommand(opts *RunCommandOptions) error {
Stdout: opts.Stdout, Stdout: opts.Stdout,
Stderr: opts.Stderr, Stderr: opts.Stderr,
} }
if err = r.Run(); err != nil { return r.Run()
return err
}
return nil
} }

23
task.go
View File

@ -152,17 +152,11 @@ func (e *Executor) runDeps(ctx context.Context, call Call) error {
return err return err
} }
if err = e.RunTask(ctx, Call{Task: dep, Vars: d.Vars}); err != nil { return e.RunTask(ctx, Call{Task: dep, Vars: d.Vars})
return err
}
return nil
}) })
} }
if err := g.Wait(); err != nil { return g.Wait()
return err
}
return nil
} }
func (e *Executor) isTaskUpToDate(ctx context.Context, call Call) (bool, error) { func (e *Executor) isTaskUpToDate(ctx context.Context, call Call) (bool, error) {
@ -278,20 +272,17 @@ func (e *Executor) runCommand(ctx context.Context, call Call, i int) error {
} }
e.println(c) e.println(c)
if t.Set == "" { if t.Set != "" {
opts.Stdout = e.Stdout
if err = execext.RunCommand(opts); err != nil {
return err
}
} else {
var stdout bytes.Buffer var stdout bytes.Buffer
opts.Stdout = &stdout opts.Stdout = &stdout
if err = execext.RunCommand(opts); err != nil { if err = execext.RunCommand(opts); err != nil {
return err return err
} }
os.Setenv(t.Set, strings.TrimSpace(stdout.String())) return os.Setenv(t.Set, strings.TrimSpace(stdout.String()))
} }
return nil
opts.Stdout = e.Stdout
return execext.RunCommand(opts)
} }
func (e *Executor) getTaskDir(call Call) (string, error) { func (e *Executor) getTaskDir(call Call) (string, error) {

5
taskfile.go
View File

@ -31,10 +31,7 @@ func (e *Executor) ReadTaskfile() error {
if err := mergo.MapWithOverwrite(&e.Tasks, osTasks); err != nil { if err := mergo.MapWithOverwrite(&e.Tasks, osTasks); err != nil {
return err return err
} }
if err := e.readTaskvarsFile(); err != nil { return e.readTaskvarsFile()
return err
}
return nil
} }
func (e *Executor) readTaskfileData(path string) (tasks map[string]*Task, err error) { func (e *Executor) readTaskfileData(path string) (tasks map[string]*Task, err error) {