Skip to content

Commit

Permalink
Ensure that boostrapper --help always work
Browse files Browse the repository at this point in the history
It should display something even when the boostrapper is in silent or very
silent mode.

Fixes #2099
  • Loading branch information
vbfox committed Jan 29, 2017
1 parent 4081e77 commit 2e2fe3c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
15 changes: 15 additions & 0 deletions src/Paket.Bootstrapper/ConsoleImpl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,28 @@ internal static void WriteTrace(string message)
WriteConsole(message, ConsoleColor.DarkGray, Verbosity.Trace);
}

internal static void WriteAlways(string message, params object[] parameters)
{
WriteConsoleCore(string.Format(message, parameters), Console.ForegroundColor);
}

internal static void WriteAlways(string message)
{
WriteConsoleCore(message, Console.ForegroundColor);
}

private static void WriteConsole(string message, ConsoleColor consoleColor, Verbosity minVerbosity = Verbosity.Normal)
{
if (Verbosity < minVerbosity)
{
return;
}

WriteConsoleCore(message, consoleColor);
}

private static void WriteConsoleCore(string message, ConsoleColor consoleColor)
{
var oldColor = Console.ForegroundColor;
Console.ForegroundColor = consoleColor;
Console.WriteLine(message);
Expand Down
2 changes: 1 addition & 1 deletion src/Paket.Bootstrapper/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static void Main(string[] args)
Environment.GetEnvironmentVariables(), fileProxy, argumentsFromDependenciesFile);
if (options.ShowHelp)
{
ConsoleImpl.WriteInfo(BootstrapperHelper.HelpText);
ConsoleImpl.WriteAlways(BootstrapperHelper.HelpText);
return;
}

Expand Down

0 comments on commit 2e2fe3c

Please sign in to comment.