a little more cleanup
License: MIT Signed-off-by: Jeromy <why@ipfs.io>
Jeromy committed
Jul 9, 2016 at 13:12 UTC
9ff238e860a9646d97832c74365f8708c56532e2
1 file changed
+10
-16
commands/cli/parse.go
+10
-16
@@ -304,12 +304,10 @@ func parseArgs(inputs []string, stdin *os.File, argDefs []cmds.Argument, recursi
304
case cmds.ArgString:
305
if len(inputs) > 0 {
306
stringArgs, inputs = append(stringArgs, inputs[0]), inputs[1:]
307
- } else {
308
- if stdin != nil && argDef.SupportsStdin && !fillingVariadic {
309
- if err := printReadInfo(stdin, msgStdinInfo); err == nil {
310
- fileArgs[stdin.Name()] = files.NewReaderFile("stdin", "", stdin, nil)
311
- stdin = nil
312
- }
307
+ } else if stdin != nil && argDef.SupportsStdin && !fillingVariadic {
308
+ if err := printReadInfo(stdin, msgStdinInfo); err == nil {
309
+ fileArgs[stdin.Name()] = files.NewReaderFile("stdin", "", stdin, nil)
310
+ stdin = nil
311
}
312
}
313
case cmds.ArgFile:
@@ -332,17 +330,13 @@ func parseArgs(inputs []string, stdin *os.File, argDefs []cmds.Argument, recursi
330
}
331
332
fileArgs[fpath] = file
335
- } else {
336
- if stdin != nil && argDef.SupportsStdin &&
337
- argDef.Required && !fillingVariadic {
338
- if err := printReadInfo(stdin, msgStdinInfo); err != nil {
339
- return nil, nil, err
340
- }
341
- fpath := stdin.Name()
342
- fileArgs[fpath] = files.NewReaderFile("", fpath, stdin, nil)
343
- } else {
344
- break
333
+ } else if stdin != nil && argDef.SupportsStdin &&
334
+ argDef.Required && !fillingVariadic {
335
+ if err := printReadInfo(stdin, msgStdinInfo); err != nil {
336
+ return nil, nil, err
337
}
338
+ fpath := stdin.Name()
339
+ fileArgs[fpath] = files.NewReaderFile("", fpath, stdin, nil)
340
}
341
}
342