HTMLC-143: fixed bug

lk-code · lk-code · commit f21901c110a5 · 2023-11-08T21:34:14.000+01:00
diff --git a/source/HtmlCompiler.Core/CLIManager.cs b/source/HtmlCompiler.Core/CLIManager.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Text;
 using HtmlCompiler.Core.Exceptions;
 using HtmlCompiler.Core.Interfaces;
@@ -15,7 +16,7 @@ public string ExecuteCommand(string command)
     {
         ProcessStartInfo processInfo = new ProcessStartInfo
         {
-            FileName = "bash", // Verwende eine Shell (z.B. bash) zum Ausführen des Befehls
+            FileName = ((RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) ? "pwsh" : "bash"),
             Arguments = $"-c \"{command}\"",
             RedirectStandardOutput = true,
             RedirectStandardError = true,
diff --git a/source/HtmlCompiler.Tests/Core/Dependencies/NodeDependencyTests.cs b/source/HtmlCompiler.Tests/Core/Dependencies/NodeDependencyTests.cs
@@ -25,6 +25,10 @@ public void SetUp()
     [DataRow("v14.17.0")]
     [DataRow("v18.1.9\n")]
     [DataRow("v20.4.0\n")]
+    [DataRow("v20.9.0\n")]
+    [DataRow("v18.1.9\r\n")]
+    [DataRow("v20.4.0\r\n")]
+    [DataRow("v20.9.0\r\n")]
     public async Task CheckAsync_WithValidVersions_Return(string consoleResult)
     {
         this._cliManager.ExecuteCommand(Arg.Any<string>())

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Diagnostics;`
	`2`	`+using System.Runtime.InteropServices;`
`2`	`3`	`using System.Text;`
`3`	`4`	`using HtmlCompiler.Core.Exceptions;`
`4`	`5`	`using HtmlCompiler.Core.Interfaces;`
`@@ -15,7 +16,7 @@ public string ExecuteCommand(string command)`
`15`	`16`	`{`
`16`	`17`	`ProcessStartInfo processInfo = new ProcessStartInfo`
`17`	`18`	`{`
`18`		`- FileName = "bash", // Verwende eine Shell (z.B. bash) zum Ausführen des Befehls`
	`19`	`+ FileName = ((RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) ? "pwsh" : "bash"),`
`19`	`20`	`Arguments = $"-c \"{command}\"",`
`20`	`21`	`RedirectStandardOutput = true,`
`21`	`22`	`RedirectStandardError = true,`