Skip to content

Commit d1fa43c

Browse files
committed
cmd/packaging/darwin-pkg: Fix error handling
1 parent a626790 commit d1fa43c

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

cmd/packaging/darwin-pkg.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"os"
66
"os/exec"
77
"path/filepath"
8+
9+
"github.com/pkg/errors"
810
)
911

1012
// DarwinPkgTask packaging for darwin as pkg
@@ -22,7 +24,7 @@ var DarwinPkgTask = &packagingTask{
2224

2325
payload, err := os.OpenFile(filepath.Join("flat", "base.pkg", "Payload"), os.O_RDWR|os.O_CREATE, 0755)
2426
if err != nil {
25-
return "", nil
27+
return "", err
2628
}
2729

2830
cmdFind := exec.Command("find", ".")
@@ -34,37 +36,37 @@ var DarwinPkgTask = &packagingTask{
3436
// Pipes like this: find | cpio | gzip > Payload
3537
cmdCpio.Stdin, err = cmdFind.StderrPipe()
3638
if err != nil {
37-
return "", nil
39+
return "", err
3840
}
3941
cmdGzip.Stdin, err = cmdCpio.StderrPipe()
4042
if err != nil {
41-
return "", nil
43+
return "", err
4244
}
4345
cmdGzip.Stdout = payload
4446

4547
err = cmdGzip.Start()
4648
if err != nil {
47-
return "", nil
49+
return "", err
4850
}
4951
err = cmdCpio.Start()
5052
if err != nil {
51-
return "", nil
53+
return "", err
5254
}
5355
err = cmdFind.Run()
5456
if err != nil {
55-
return "", nil
57+
return "", err
5658
}
5759
err = cmdCpio.Wait()
5860
if err != nil {
59-
return "", nil
61+
return "", err
6062
}
6163
err = cmdGzip.Wait()
6264
if err != nil {
63-
return "", nil
65+
return "", err
6466
}
6567
err = payload.Close()
6668
if err != nil {
67-
return "", nil
69+
return "", err
6870
}
6971

7072
cmdMkbom := exec.Command("mkbom", "-u", "0", "-g", "80", filepath.Join("flat", "root"), filepath.Join("flat", "base.pkg", "Payload"))
@@ -82,7 +84,7 @@ var DarwinPkgTask = &packagingTask{
8284
return nil
8385
})
8486
if err != nil {
85-
return "", nil
87+
return "", errors.Wrap(err, "failed to iterate over ")
8688
}
8789

8890
cmdXar := exec.Command("xar", append([]string{"--compression", "none", "-cf", filepath.Join("..", outputFileName)}, files...)...)
@@ -91,7 +93,7 @@ var DarwinPkgTask = &packagingTask{
9193
cmdXar.Stderr = os.Stderr
9294
err = cmdXar.Run()
9395
if err != nil {
94-
return "", nil
96+
return "", errors.Wrap(err, "failed to run xar")
9597
}
9698
return outputFileName, nil
9799
},

0 commit comments

Comments
 (0)