Merge pull request #3134 from ipfs/fix/cmd/repeated-help-text

whyrusleeping · web-flow · commit 050985c52bbf · 2016-08-29T09:12:44.000-07:00
cli: Fix stdin help text being show multiple times
diff --git a/commands/cli/parse.go b/commands/cli/parse.go
@@ -251,7 +251,7 @@ func parseOpts(args []string, root *cmds.Command) (
 	return
 }
 
-const msgStdinInfo = "ipfs: Reading from %s; send Ctrl-d to stop.\n"
+const msgStdinInfo = "ipfs: Reading from %s; send Ctrl-d to stop."
 
 func parseArgs(inputs []string, stdin *os.File, argDefs []cmds.Argument, recursive, hidden bool, root *cmds.Command) ([]string, []files.File, error) {
 	// ignore stdin on Windows
@@ -469,6 +469,7 @@ func newMessageReader(r io.ReadCloser, msg string) io.ReadCloser {
 func (r *messageReader) Read(b []byte) (int, error) {
 	if !r.done {
 		fmt.Fprintln(os.Stderr, r.message)
+		r.done = true
 	}
 
 	return r.r.Read(b)

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ func parseOpts(args []string, root *cmds.Command) (`
`251`	`251`	`return`
`252`	`252`	`}`
`253`	`253`
`254`		`-const msgStdinInfo = "ipfs: Reading from %s; send Ctrl-d to stop.\n"`
	`254`	`+const msgStdinInfo = "ipfs: Reading from %s; send Ctrl-d to stop."`
`255`	`255`
`256`	`256`	`func parseArgs(inputs []string, stdin os.File, argDefs []cmds.Argument, recursive, hidden bool, root cmds.Command) ([]string, []files.File, error) {`
`257`	`257`	`// ignore stdin on Windows`
`@@ -469,6 +469,7 @@ func newMessageReader(r io.ReadCloser, msg string) io.ReadCloser {`
`469`	`469`	`func (r *messageReader) Read(b []byte) (int, error) {`
`470`	`470`	`if !r.done {`
`471`	`471`	`fmt.Fprintln(os.Stderr, r.message)`
	`472`	`+ r.done = true`
`472`	`473`	`}`
`473`	`474`
`474`	`475`	`return r.r.Read(b)`