diff --git a/Droplex.Test.Console/Program.cs b/Droplex.Test.Console/Program.cs index 852b21e..91ead10 100644 --- a/Droplex.Test.Console/Program.cs +++ b/Droplex.Test.Console/Program.cs @@ -7,11 +7,19 @@ class Program { static void Main(string[] args) { - Task a = DroplexPackage.Drop(App.python3_9_1); - - Task b = DroplexPackage.Drop(App.Everything1_3_4_686); - - Task.WaitAll(a, b); + try + { + Task a = DroplexPackage.Drop(App.python3_9_1); + Task b = DroplexPackage.Drop(App.Everything1_3_4_686); + Task c = DroplexPackage.Drop(App.Putty_0_74); + + Task.WaitAll(a, b, c); + } + catch(Exception e) + { + Console.WriteLine($"Error: {e.Message}"); + Console.ReadKey(); + } } } } diff --git a/Droplex/App.cs b/Droplex/App.cs index e5803c9..e2c7679 100644 --- a/Droplex/App.cs +++ b/Droplex/App.cs @@ -8,6 +8,7 @@ public enum App { python3_9_1 = 1, python3_8_7 = 2, - Everything1_3_4_686 = 3 + Everything1_3_4_686 = 3, + Putty_0_74 = 4 } } diff --git a/Droplex/Droplex.Configuration.yml b/Droplex/Droplex.Configuration.yml index 01fb275..7283691 100644 --- a/Droplex/Droplex.Configuration.yml +++ b/Droplex/Droplex.Configuration.yml @@ -14,4 +14,10 @@ version: 1.3.4.686 id: 3 url: https://www.voidtools.com/Everything-1.3.4.686.x64-Setup.exe - args: /S \ No newline at end of file + args: /S + +- name: Putty + version: 0.74 + id: 4 + url: https://the.earth.li/~sgtatham/putty/latest/w64/putty-64bit-0.74-installer.msi + args: -passive \ No newline at end of file diff --git a/Droplex/Droplex.csproj b/Droplex/Droplex.csproj index d3fdaa8..39b9b61 100644 --- a/Droplex/Droplex.csproj +++ b/Droplex/Droplex.csproj @@ -10,9 +10,9 @@ - 1.0.5 - 1.0.5 - 1.0.5 + 1.1.0 + 1.1.0 + 1.1.0 Droplex Jeremy Wu MIT diff --git a/Droplex/Installer.cs b/Droplex/Installer.cs index a445ba1..f0cb775 100644 --- a/Droplex/Installer.cs +++ b/Droplex/Installer.cs @@ -16,10 +16,13 @@ public static class Installer /// Thrown when the installation is cancelled or unsuccessful public static async Task Install(string filepath, string installArgs) { + // For the case where path contains a comma + var path = '"' + filepath + '"'; + var psi = new ProcessStartInfo { - UseShellExecute = false, - FileName = filepath, + UseShellExecute = true, + FileName = path, Arguments = installArgs };