From fd16e2d7d6959c79a7c63b4be5e133bc62172135 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 14 Apr 2016 07:04:36 +0200 Subject: [PATCH] Wait for uninstall.exe to terminate refs #11449 --- icinga-installer/icinga-installer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/icinga-installer/icinga-installer.cpp b/icinga-installer/icinga-installer.cpp index e5560a965..f87debb63 100644 --- a/icinga-installer/icinga-installer.cpp +++ b/icinga-installer/icinga-installer.cpp @@ -137,10 +137,14 @@ static int UpgradeNSIS(void) if (installPath.IsEmpty()) return 0; - if (!Utility::PathExists(installPath + "\\uninstall.exe")) + String uninstallerPath = installPath + "\\uninstall.exe"; + + if (!Utility::PathExists(uninstallerPath)) return 0; - ExecuteCommand(installPath + "\\uninstall.exe", "/S"); + ExecuteCommand(uninstallerPath, "/S \"_?=" + installPath + "\""); + + _unlink(uninstallerPath.CStr()); String dataPath = Utility::GetIcingaDataPath(); -- 2.40.0