commands/cli: Fixed parse bug when optional argument is defined first

a69ddbb9 · Matt Bell · cefb0140 · a69ddbb9
Commit a69ddbb9 authored 10 years ago by Matt Bell
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

commands/cli/parse.go commands/cli/parse.go +5 -3

No files found.
--- a/commands/cli/parse.go
+++ b/commands/cli/parse.go
@@ -182,9 +182,11 @@ func parseArgs(inputs []string, stdin *os.File, argDefs []cmds.Argument, recursi
 		argDef := getArgDef(argDefIndex, argDefs)

 		// skip optional argument definitions if there aren't sufficient remaining inputs
-		if numInputs-i <= numRequired && !argDef.Required {
-			continue
-		} else if argDef.Required {
+		for numInputs-i <= numRequired && !argDef.Required {
+			argDefIndex++
+			argDef = getArgDef(argDefIndex, argDefs)
+		}
+		if argDef.Required {
 			numRequired--
 		}