diff options
author | Simon Tatham <anakin@pobox.com> | 2020-07-24 10:06:33 +0100 |
---|---|---|
committer | Simon Tatham <anakin@pobox.com> | 2020-12-17 11:53:02 +0000 |
commit | 011e428880d14afd4811a02f07e56af5876f9583 (patch) | |
tree | ca4e1ee91d31000a7bed0613a0eeffcc30249fe0 | |
parent | 7ce9de201708eb3b69b7dd8dee7c0b9ded15e905 (diff) | |
download | wix-011e428880d14afd4811a02f07e56af5876f9583.tar.gz wix-011e428880d14afd4811a02f07e56af5876f9583.tar.bz2 wix-011e428880d14afd4811a02f07e56af5876f9583.zip |
[Linux] Fix newline handling in help message.
The current help message for `wix` itself doesn't end in a newline. On
Windows that's only a minor oddity because command prompts are
typically preceded by a newline anyway; on Linux, they're typically
not, so it's much more unfriendly to leave the shell prompt at the end
of a line.
Also, generating newlines using Console.WriteLine instead of an
explicit `\r\n` means they automatically adapt to the local platform's
newline convention.
-rw-r--r-- | src/WixToolset.Core/AppCommon.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/WixToolset.Core/AppCommon.cs b/src/WixToolset.Core/AppCommon.cs index 3ea09f08..7f54b057 100644 --- a/src/WixToolset.Core/AppCommon.cs +++ b/src/WixToolset.Core/AppCommon.cs | |||
@@ -28,7 +28,8 @@ namespace WixToolset.Core | |||
28 | public static void DisplayToolHeader() | 28 | public static void DisplayToolHeader() |
29 | { | 29 | { |
30 | var assembly = Assembly.GetCallingAssembly(); | 30 | var assembly = Assembly.GetCallingAssembly(); |
31 | Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]\r\n[AssemblyCopyright]", assembly)); | 31 | Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]", assembly)); |
32 | Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyCopyright]", assembly)); | ||
32 | } | 33 | } |
33 | 34 | ||
34 | /// <summary> | 35 | /// <summary> |
@@ -37,7 +38,8 @@ namespace WixToolset.Core | |||
37 | public static void DisplayToolFooter() | 38 | public static void DisplayToolFooter() |
38 | { | 39 | { |
39 | var assembly = Assembly.GetCallingAssembly(); | 40 | var assembly = Assembly.GetCallingAssembly(); |
40 | Console.Write(WixDistribution.ReplacePlaceholders("\r\nFor more information see: [SupportUrl]", assembly)); | 41 | Console.WriteLine(); |
42 | Console.WriteLine(WixDistribution.ReplacePlaceholders("For more information see: [SupportUrl]", assembly)); | ||
41 | } | 43 | } |
42 | } | 44 | } |
43 | } | 45 | } |