From 9016bd10681dc8603de38f59de203e75b588a46b Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 10 May 2019 15:25:16 +0300 Subject: [PATCH] Show help if no command specified --- .../Volo/Abp/Cli/Commands/CommandSelector.cs | 11 ++++++++--- .../Volo/Abp/Cli/Commands/HelpCommand.cs | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs index d3d3d7c736..595917e845 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs @@ -1,6 +1,6 @@ -using System; +using Microsoft.Extensions.Options; +using System; using System.Collections.Generic; -using Microsoft.Extensions.Options; using Volo.Abp.Cli.Args; using Volo.Abp.DependencyInjection; @@ -17,7 +17,12 @@ namespace Volo.Abp.Cli.Commands public Type Select(CommandLineArgs commandLineArgs) { - return Options.Commands.GetOrDefault(commandLineArgs.Command) + if (commandLineArgs.Command.IsNullOrWhiteSpace()) + { + return typeof(HelpCommand); + } + + return Options.Commands.GetOrDefault(commandLineArgs.Command) ?? typeof(HelpCommand); } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs index fdad2a445e..0094783555 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs @@ -9,11 +9,11 @@ namespace Volo.Abp.Cli.Commands { public Task ExecuteAsync(CommandLineArgs commandLineArgs) { - Console.WriteLine("*********** ABP CLI ****************"); Console.WriteLine(); Console.WriteLine("Usage:"); Console.WriteLine(); Console.WriteLine(" abp [options]"); + Console.WriteLine(); return Task.CompletedTask; } }