mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

cli: help displayed when a Command has no execute function (fix #6530) (#6567)

Browse Source
This commit is contained in:
shnorbluk 2020-10-07 05:39:13 +02:00 committed by GitHub
parent ce302c29e4
commit b940dc4f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
vlib/cli/command.v
View File

@ -186,33 +186,29 @@ fn (mut cmd Command) parse_commands() {
}
}
// if no further command was found, execute current command
if int(cmd.execute) == 0 {
if !cmd.disable_help {
cmd.execute_help()
}
} else {
if cmd.required_args > 0 {
if cmd.required_args > cmd.args.len {
println('Command `$cmd.name` needs at least $cmd.required_args arguments')
exit(1)
}
}
cmd.check_required_flags()
if int(cmd.pre_execute) > 0 {
cmd.pre_execute(*cmd) or {
println('cli preexecution error: $err')
exit(1)
}
}
cmd.execute(*cmd) or {
println('cli execution error: $err')
if cmd.required_args > 0 {
if cmd.required_args > cmd.args.len {
eprintln('Command `$cmd.name` needs at least $cmd.required_args arguments')
exit(1)
}
if int(cmd.post_execute) > 0 {
cmd.post_execute(*cmd) or {
println('cli postexecution error: $err')
exit(1)
}
}
cmd.check_required_flags()
if int(cmd.pre_execute) > 0 {
cmd.pre_execute(*cmd) or {
eprintln('cli preexecution error: $err')
exit(1)
}
}
if int(cmd.execute) > 0 {
cmd.execute(*cmd) or {
eprintln('cli execution error: $err')
exit(1)
}
}
if int(cmd.post_execute) > 0 {
cmd.post_execute(*cmd) or {
eprintln('cli postexecution error: $err')
exit(1)
}
}
}

0
vlib/v/tests/inout/cli_command_no_execute.out Normal file
View File

7
vlib/v/tests/inout/cli_command_no_execute.vv Normal file
View File

@ -0,0 +1,7 @@
import os
import cli {Command}
fn main() {
mut cmd := Command {}
cmd.parse(os.args)
}