Skip to content

Commit

Permalink
osbuildprogress: reorg lines a bit
Browse files Browse the repository at this point in the history
  • Loading branch information
mvo5 committed Jul 30, 2024
1 parent 601e27b commit e0ac561
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions bib/internal/osbuildprogress/progress.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,18 +174,19 @@ func RunOSBuild(manifest []byte, store, outputDirectory string, exports, extraEn
"--monitor-fd=3",
"-",
)
for _, export := range exports {
cmd.Args = append(cmd.Args, "--export", export)
}

cmd.Env = append(os.Environ(), extraEnv...)
cmd.Stdin = bytes.NewBuffer(manifest)
cmd.Stderr = os.Stderr
// we could use "--json" here and would get the build-result
// exported here
cmd.Stdout = nil
cmd.Stdout = os.Stdout
cmd.ExtraFiles = []*os.File{wp}
go AttachProgress(wg, rp, os.Stdout)

for _, export := range exports {
cmd.Args = append(cmd.Args, "--export", export)
}
go AttachProgress(wg, rp, os.Stdout)
if err := cmd.Start(); err != nil {
return fmt.Errorf("error starting osbuild: %v", err)
}
Expand Down

0 comments on commit e0ac561

Please sign in to comment.