From 77e49421bc8eeb174257de59436b759da7d2394a Mon Sep 17 00:00:00 2001
From: Marcus Llewellyn <marcus.llewellyn@gmail.com>
Date: Sun, 5 Jan 2020 18:44:17 -0600
Subject: [PATCH] Fix installer failing when signing certifcate is not
 available.

This commit comments out the code signing portion of the installer for now. Also a few minor cosmetic changes
---
 cmake/templates/NSIS.template.in | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 8533ce3421..6f06b6b56d 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -199,15 +199,18 @@
 
     !system "$%TEMP%\tempinstaller.exe" = 2
 
+    ; NOTE: We're not code signing right now, so we're going to disable that.
+    ; TODO: Get a code signing certificate so we can re-enable code signing.
+
     ; The Inner invocation has written an uninstaller binary for us.
     ; We need to sign it if it's a production or PR build.
-    !if @PRODUCTION_BUILD@ == 1
-      !if @BYPASS_SIGNING@ == 1
-        !warning "BYPASS_SIGNING set - installer will not be signed"
-      !else
-        !system '"@SIGNTOOL_EXECUTABLE@" sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 $%TEMP%\@UNINSTALLER_NAME@' = 0
-      !endif
-    !endif
+    ; !if @PRODUCTION_BUILD@ == 1
+    ;   !if @BYPASS_SIGNING@ == 1
+    ;     !warning "BYPASS_SIGNING set - installer will not be signed"
+    ;   !else
+    ;     !system '"@SIGNTOOL_EXECUTABLE@" sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 $%TEMP%\@UNINSTALLER_NAME@' = 0
+    ;   !endif
+    ; !endif
 
     ; Good.  Now we can carry on writing the real installer.
 
@@ -717,7 +720,7 @@ Function InstallTypesPage
   StrCpy $OffsetUnits u
   StrCpy $Express "0"
 
-  ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls High Fidelity Interface and High Fidelity Sandbox"
+  ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls Project Athena Interface and Project Athena Sandbox"
   pop $ExpressInstallRadioButton
   ${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel
   IntOp $CurrentOffset $CurrentOffset + 15
@@ -970,7 +973,7 @@ Function ReadPostInstallOptions
   
   ${If} @CLIENT_COMPONENT_CONDITIONAL@
     ${LogText} "Option: Install Client"
-    ; check if the user asked for a desktop shortcut to High Fidelity
+    ; check if the user asked for a desktop shortcut to Project Athena
     ${NSD_GetState} $DesktopClientCheckbox $DesktopClientState
     ${LogText} "Option: Create Client Desktop Shortcut: $DesktopClientState"
   ${EndIf}
@@ -1024,7 +1027,7 @@ Function HandlePostInstallOptions
   ${EndIf}
 
   ${If} @CLIENT_COMPONENT_CONDITIONAL@
-    ; check if the user asked for a desktop shortcut to High Fidelity
+    ; check if the user asked for a desktop shortcut to Project Athena
     ${If} $DesktopClientState == ${BST_CHECKED}
       CreateShortCut "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
       !insertmacro WriteInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES