2021.4.7 #29

Merged
edraft merged 9 commits from 2021.4.7 into 2021.4.post1 2021-04-13 15:47:25 +02:00
2 changed files with 5 additions and 3 deletions
Showing only changes of commit 602c48bc06 - Show all commits

View File

@ -89,8 +89,9 @@ class CLI(ApplicationABC):
if is_option: if is_option:
args.append(cmd.name) args.append(cmd.name)
for arg in result_args: if result_args is not None:
args.append(arg) for arg in result_args:
args.append(arg)
elif result is not None: elif result is not None:
command = cmd.name command = cmd.name

View File

@ -39,11 +39,12 @@ class HelpService(CommandABC):
command_name = args[0] command_name = args[0]
command: Optional[CommandABC] = None command: Optional[CommandABC] = None
for cmd in self._commands: for cmd in self._commands:
if cmd.name == command_name: if cmd.name == command_name or command_name in cmd.aliases:
command = self._services.get_service(cmd.command) command = self._services.get_service(cmd.command)
if command is None: if command is None:
Console.error(f'Invalid argument: {command_name}') Console.error(f'Invalid argument: {command_name}')
return
Console.write_line(command.help_message) Console.write_line(command.help_message)