From a49fe4844b8d6f67a17f0f1ce202dc7684c138ce Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 10 Sep 2019 12:30:20 -0700 Subject: [PATCH 1/4] BUGZ-1167: remove unwanted binaries from bad client-only installers --- cmake/templates/NSIS.template.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index cc7a6929a2..0db2592143 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -1156,7 +1156,12 @@ FunctionEnd Section "-Core installation" - ;The following delete blocks are temporary and can be removed once users who had the initial installer have updated + ; 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-console files installed before it was placed in sub-folder Delete "$INSTDIR\server-console.exe" From 967e7db0bb64233a6162d1e1dbae0d2489cc762c Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 10 Sep 2019 16:29:45 -0700 Subject: [PATCH 2/4] 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" From 9be475bff83da88a5b40a4e55357a781b443b6e7 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 10 Sep 2019 18:43:34 -0700 Subject: [PATCH 3/4] Trying to fix client-only build --- cmake/templates/NSIS.template.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index f06985d8be..e93c454e7e 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -1159,8 +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. + MessageBox MB_OK|MB_ICONEXCLAMATION "installer type is @INSTALLER_TYPE@" + ;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" + MessageBox MB_OK|MB_ICONEXCLAMATION "trying to delete server binaries" Delete "$INSTDIR\assignment-client.exe" Delete "$INSTDIR\domain-server.exe" ${EndIf} From 790ac6a483bed5904ad2aeb107adf53512b4c3b2 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 10 Sep 2019 20:40:59 -0700 Subject: [PATCH 4/4] Removing debugging popups --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index e93c454e7e..9af99f927d 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -1159,11 +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. - MessageBox MB_OK|MB_ICONEXCLAMATION "installer type is @INSTALLER_TYPE@" + ; MessageBox MB_OK|MB_ICONEXCLAMATION "installer type is @INSTALLER_TYPE@" ;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" - MessageBox MB_OK|MB_ICONEXCLAMATION "trying to delete server binaries" + ; MessageBox MB_OK|MB_ICONEXCLAMATION "trying to delete server binaries" Delete "$INSTDIR\assignment-client.exe" Delete "$INSTDIR\domain-server.exe" ${EndIf}