From 2318b6aef81e2d597192053ada5c57311c5ee357 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Jun 2017 15:02:59 -0700
Subject: [PATCH 1/2] Add a /forceNoLaunch switch to the installer

---
 cmake/templates/NSIS.template.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 033e9e0255..6a3263b10b 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -470,6 +470,7 @@ Function PostInstallOptionsPage
 
   StrCpy $CurrentOffset 0
   StrCpy $OffsetUnits u
+  ${StrContains} $AR_RegFlags "/forceNoLaunch" $CMDLINE
 
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_HF_SHORTCUT_NAME@"
@@ -504,6 +505,9 @@ Function PostInstallOptionsPage
 
     ; set the checkbox state depending on what is present in the registry
     !insertmacro SetPostInstallOption $LaunchServerNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
+    ${If} $AR_RegFlags == "/forceNoLaunch"
+        ${NSD_SetState} $LaunchServerNowCheckbox ${BST_UNCHECKED}
+    ${EndIf}
 
     IntOp $CurrentOffset $CurrentOffset + 15
   ${EndIf}
@@ -514,6 +518,9 @@ Function PostInstallOptionsPage
 
 	  ; set the checkbox state depending on what is present in the registry
 	  !insertmacro SetPostInstallOption $LaunchClientNowCheckbox @CLIENT_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
+      ${If} $AR_RegFlags == "/forceNoLaunch"
+          ${NSD_SetState} $LaunchClientNowCheckbox ${BST_UNCHECKED}
+      ${EndIf}
   ${EndIf}
 
   ${If} @PR_BUILD@ == 1

From e5666fbb2f9e0e7fa403cb3eafc74a386e253597 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Jun 2017 15:35:21 -0700
Subject: [PATCH 2/2] Two different options for server and client

---
 cmake/templates/NSIS.template.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 6a3263b10b..710fd81316 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -470,7 +470,6 @@ Function PostInstallOptionsPage
 
   StrCpy $CurrentOffset 0
   StrCpy $OffsetUnits u
-  ${StrContains} $AR_RegFlags "/forceNoLaunch" $CMDLINE
 
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_HF_SHORTCUT_NAME@"
@@ -505,7 +504,8 @@ Function PostInstallOptionsPage
 
     ; set the checkbox state depending on what is present in the registry
     !insertmacro SetPostInstallOption $LaunchServerNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
-    ${If} $AR_RegFlags == "/forceNoLaunch"
+    ${StrContains} $substringResult "/forceNoLaunchServer" $CMDLINE
+    ${IfNot} $substringResult == ""
         ${NSD_SetState} $LaunchServerNowCheckbox ${BST_UNCHECKED}
     ${EndIf}
 
@@ -518,7 +518,8 @@ Function PostInstallOptionsPage
 
 	  ; set the checkbox state depending on what is present in the registry
 	  !insertmacro SetPostInstallOption $LaunchClientNowCheckbox @CLIENT_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
-      ${If} $AR_RegFlags == "/forceNoLaunch"
+      ${StrContains} $substringResult "/forceNoLaunchClient" $CMDLINE
+      ${IfNot} $substringResult == ""
           ${NSD_SetState} $LaunchClientNowCheckbox ${BST_UNCHECKED}
       ${EndIf}
   ${EndIf}