Merge pull request #5 from jjw24/add_putty

Add putty + others
jjw24 · Feb 8, 2021 · 7f8c6eb · 7f8c6eb
2 parents d593489 + e7fdaa4
commit 7f8c6eb
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
+  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
diff --git a/Droplex/Droplex.csproj b/Droplex/Droplex.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageVersion>1.0.5</PackageVersion>
-    <AssemblyVersion>1.0.5</AssemblyVersion>
-    <InformationalVersion>1.0.5</InformationalVersion>
+    <PackageVersion>1.1.0</PackageVersion>
+    <AssemblyVersion>1.1.0</AssemblyVersion>
+    <InformationalVersion>1.1.0</InformationalVersion>
     <PackageId>Droplex</PackageId>
     <Authors>Jeremy Wu</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/Droplex/Installer.cs b/Droplex/Installer.cs
@@ -16,10 +16,13 @@ public static class Installer
         /// <exception cref="OperationCanceledException">Thrown when the installation is cancelled or unsuccessful </exception>
         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
             };