Merge pull request Squirrel#109 from mwcampbell/fix-update-uninstaller

Include the --uninstall option in the uninstaller command line by default
djanknecht · Oct 28, 2014 · ebc56c9 · ebc56c9
2 parents 7afa540 + fb55fb6
commit ebc56c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Squirrel/UpdateManager.InstallHelpers.cs b/src/Squirrel/UpdateManager.InstallHelpers.cs
@@ -105,7 +105,7 @@ public async Task<RegistryKey> CreateUninstallerRegistryEntry(string uninstallCm
             public Task<RegistryKey> CreateUninstallerRegistryEntry()
             {
                 var updateDotExe = Path.Combine(rootAppDirectory, "Update.exe");
-                return CreateUninstallerRegistryEntry(updateDotExe, "-s");
+                return CreateUninstallerRegistryEntry(String.Format("{0} --uninstall", updateDotExe), "-s");
             }
 
             public void RemoveUninstallerRegistryEntry()

diff --git a/src/Update/Program.cs b/src/Update/Program.cs
@@ -172,7 +172,7 @@ public async Task Install(bool silentInstall, string sourceDirectory = null)
                     "Failed to copy Update.exe to " + updateTarget);
 
                 await this.ErrorIfThrows(() =>
-                    mgr.CreateUninstallerRegistryEntry(String.Format("{0} --uninstall", updateTarget), "-s"),
+                    mgr.CreateUninstallerRegistryEntry(),
                     "Failed to create uninstaller registry entry");
             }
         }
@@ -190,7 +190,7 @@ public async Task Update(string updateUrl, string appName = null)
                 var updateTarget = Path.Combine(mgr.RootAppDirectory, "Update.exe");
 
                 await this.ErrorIfThrows(() =>
-                    mgr.CreateUninstallerRegistryEntry(String.Format("{0} --uninstall", updateTarget), "-s"),
+                    mgr.CreateUninstallerRegistryEntry(),
                     "Failed to create uninstaller registry entry");
             }
         }
@@ -574,4 +574,4 @@ public void Dispose()
             lock(gate) inner.Dispose();
         }
     }
-}
+}