vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cli: fix checking callbacks (#8858)

pull/8898/head
Stanislav Ershov 2021-02-20 20:30:39 +05:00 committed by GitHub
parent a86bf3254a
commit 44cb0426f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/cli/command.v
View File

@ -210,7 +210,7 @@ fn (mut cmd Command) parse_commands() {
} }
} }
} }
if cmd.is_root() && int(cmd.execute) == 0 { if cmd.is_root() && isnil(cmd.execute) {
if !cmd.disable_help { if !cmd.disable_help {
cmd.execute_help() cmd.execute_help()
return return
@ -224,19 +224,19 @@ fn (mut cmd Command) parse_commands() {
} }
} }
cmd.check_required_flags() cmd.check_required_flags()
if int(cmd.pre_execute) > 0 { if !isnil(cmd.pre_execute) {
cmd.pre_execute(*cmd) or { cmd.pre_execute(*cmd) or {
eprintln('cli preexecution error: $err') eprintln('cli preexecution error: $err')
exit(1) exit(1)
} }
} }
if int(cmd.execute) > 0 { if !isnil(cmd.execute) {
cmd.execute(*cmd) or { cmd.execute(*cmd) or {
eprintln('cli execution error: $err') eprintln('cli execution error: $err')
exit(1) exit(1)
} }
} }
if int(cmd.post_execute) > 0 { if !isnil(cmd.post_execute) {
cmd.post_execute(*cmd) or { cmd.post_execute(*cmd) or {
eprintln('cli postexecution error: $err') eprintln('cli postexecution error: $err')
exit(1) exit(1)