mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #209 from dotnet/anurse/202-duplicated-help

Browse source 
fix #202 by exiting on invalid option
This commit is contained in:
Piotr Puszkiewicz 2015-11-17 22:04:05 -08:00
commit 380eda370c
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Microsoft.DotNet.Cli/Program.cs
View file

@ -33,18 +33,24 @@ Common Commands:
{
// CommandLineApplication is a bit restrictive, so we parse things ourselves here. Individual apps should use CLA.
var verbose = false;
var success = true;
var command = string.Empty;
var lastArg = 0;
for (; lastArg < args.Length; lastArg++)
{
if (IsArg(args[lastArg], "v", "verbose"))
{
verbose = true;
}
else if (IsArg(args[lastArg], "h", "help"))
{
PrintHelp();
return 0;
}
else if (args[lastArg].StartsWith("-"))
{
PrintHelp($"Unknown option: ${args[lastArg]}");
Reporter.Error.WriteLine($"Unknown option: {args[lastArg]}");
success = false;
}
else
{
@ -53,6 +59,10 @@ Common Commands:
break;
}
}
if (!success) {
PrintHelp();
return 1;
}
var appArgs = (lastArg + 1) >= args.Length ? Enumerable.Empty<string>() : args.Skip(lastArg + 1).ToArray();
@ -87,12 +97,8 @@ Common Commands:
}
}
private static void PrintHelp(string errorMessage = null)
private static void PrintHelp()
{
if(!string.IsNullOrEmpty(errorMessage))
{
Reporter.Error.WriteLine(errorMessage.Red());
}
Reporter.Output.WriteLine(HelpText);
}