From 967e7db0bb64233a6162d1e1dbae0d2489cc762c Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 10 Sep 2019 16:29:45 -0700 Subject: [PATCH] Don't break sandbox builds --- cmake/templates/NSIS.template.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 0db2592143..f06985d8be 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -1159,9 +1159,11 @@ Section "-Core installation" ; 2016-02-25 - The following delete blocks are temporary and can be removed once users who had the initial installer have updated ; 2019-09-10 - (3 and a half years later) Sure they are buddy. Sure they are. - ;Delete any server executables that might have been installed by bad versions of the client-only installer - Delete "$INSTDIR\assignment-client.exe" - Delete "$INSTDIR\domain-server.exe" + ;Delete any server executables that might have been installed by bad versions of the client-only installer, but ONLY if we are a client-only installer + ${If} "@INSTALLER_TYPE@" == "client_only" + Delete "$INSTDIR\assignment-client.exe" + Delete "$INSTDIR\domain-server.exe" + ${EndIf} ;Delete any server-console files installed before it was placed in sub-folder Delete "$INSTDIR\server-console.exe"