Skip to content

Commit d086a28

Browse files
committed
Merge branch 'develop'
2 parents 85b5911 + 0235ad5 commit d086a28

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

cmd/duct/main.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,21 @@ standard Unix stdin to stdout filter-like data flow.
5757
`
5858

5959
func main() {
60+
os.Exit(run())
61+
}
62+
63+
func run() int {
6064
if len(os.Args) == 1 || (len(os.Args) > 1 && isHelp(os.Args[1])) {
6165
fmt.Fprintf(os.Stdout, usage)
62-
return
66+
return 0
6367
}
6468
f, err := os.CreateTemp("", duct.Pattern)
6569
if err != nil {
6670
fmt.Fprintf(os.Stderr, "failed to create a temporary file: %s", err)
67-
os.Exit(1)
71+
return 1
6872
}
6973
fds, closer := duct.NewFDs(os.Stdin, os.Stdout, duct.Discard, f)
74+
defer os.Remove(f.Name())
7075
defer closer()
7176
args := []string{}
7277
if len(os.Args) > 1 {
@@ -77,8 +82,9 @@ func main() {
7782
err = duct.Wrap(cmd, fds)
7883
if err != nil {
7984
fmt.Fprintf(os.Stderr, "failed to reformat the file: %s", err)
80-
os.Exit(1)
85+
return 1
8186
}
87+
return 0
8288
}
8389

8490
func isHelp(arg string) bool {

0 commit comments

Comments
 (0)