From bfc8e7785a0e4b67bef04b3588db223dd83eaf6e Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Mon, 14 May 2012 15:50:40 +0100
Subject: [PATCH] refs #5258. Better checking for old style install.
---
Code/Mantid/Build/CMake/NSIS.template.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/Build/CMake/NSIS.template.in b/Code/Mantid/Build/CMake/NSIS.template.in
index 895a5805186..0cb0d0aa027 100644
--- a/Code/Mantid/Build/CMake/NSIS.template.in
+++ b/Code/Mantid/Build/CMake/NSIS.template.in
@@ -965,7 +965,8 @@ Function .onInit
!insertmacro HandleRunningMantid "MantidPlot.exe" "MantidPlot appears to be running. Shut down MantidPlot and try again."
IfSilent +5
- IfFileExists $INSTDIR\uninstall.exe +3 0
+ IfFileExists $INSTDIR\uninstall.exe +4 0 ;If there is an uninstall.exe, then the machine is already using the new installers, which is fine, so continue
+ IfFileExists $INSTDIR\*.* 0 +3 ; The user appears not to have the uninstaller.exe and already has a MantidInstall directory, indicates old installer is present
MessageBox MB_YESNO "This looks like your first install with the new installer. Have you removed the previous Mantid install?$\r$\n$\r$\nIf you have not yet removed Mantid, click No, which aborts the install, and then remove it using Windows program manager." IDYES NoAbort
Abort "Cancelled. Remove old Mantid install then retry."
NoAbort:
--
GitLab