parse docopts only for parent cmdToRun

lets-cli · Feb 17, 2020 · cfd7a66 · cfd7a66
1 parent b34577f
commit cfd7a66
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/commands/command/docopts.go b/commands/command/docopts.go
@@ -16,6 +16,7 @@ var DocoptParser = &docopt.Parser{
 }
 
 // ParseDocopts parses docopts for command options with args from os.Args
+// TODO pass os.Argv explicitly
 func ParseDocopts(cmd Command) (docopt.Opts, error) {
 	// no options at all
 	if cmd.RawOptions == "" {

diff --git a/commands/run.go b/commands/run.go
@@ -62,13 +62,17 @@ func runCmd(cmdToRun command.Command, cfg *config.Config, out io.Writer, parentN
 	cmd.Stderr = out
 	cmd.Stdin = os.Stdin
 
-	// parse docopts
-	opts, err := command.ParseDocopts(cmdToRun)
-	if err != nil {
-		return formatOptsUsageError(err, opts, cmdToRun)
+	isChildCmd := parentName != ""
+
+	// parse docopts - only for parent
+	if !isChildCmd {
+		opts, err := command.ParseDocopts(cmdToRun)
+		if err != nil {
+			return formatOptsUsageError(err, opts, cmdToRun)
+		}
+		cmdToRun.Options = command.OptsToLetsOpt(opts)
+		cmdToRun.CliOptions = command.OptsToLetsCli(opts)
 	}
-	cmdToRun.Options = command.OptsToLetsOpt(opts)
-	cmdToRun.CliOptions = command.OptsToLetsCli(opts)
 
 	// setup env for command
 	cmd.Env = composeEnvs(
@@ -79,7 +83,7 @@ func runCmd(cmdToRun command.Command, cfg *config.Config, out io.Writer, parentN
 		convertEnvMapToList(cmdToRun.CliOptions),
 		convertChecksumToEnvForCmd(cmdToRun.Checksum),
 	)
-	if parentName == "" {
+	if !isChildCmd {
 		logging.Log.Debugf(
 			"Executing command\nname: %s\ncmd: %s\nenv:\n%s",
 			fmt.Sprintf(NoticeColor, cmdToRun.Name),