From fb55fb6f8053aeb15d23d16bab7f841df3e9fa42 Mon Sep 17 00:00:00 2001 From: Matt Campbell Date: Tue, 28 Oct 2014 09:31:29 -0500 Subject: [PATCH] Include the --uninstall option in the uninstaller command line by default --- src/Squirrel/UpdateManager.InstallHelpers.cs | 2 +- src/Update/Program.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Squirrel/UpdateManager.InstallHelpers.cs b/src/Squirrel/UpdateManager.InstallHelpers.cs index f5b920e45..f0f729851 100644 --- a/src/Squirrel/UpdateManager.InstallHelpers.cs +++ b/src/Squirrel/UpdateManager.InstallHelpers.cs @@ -105,7 +105,7 @@ public async Task CreateUninstallerRegistryEntry(string uninstallCm public Task 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 index f0d5fca87..aaeab5062 100644 --- 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(); } } -} \ No newline at end of file +}