From 49583db00bc9e22ab3f0c0cb49b59b48fcbf6a10 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@robmensching.com>
Date: Thu, 14 Jun 2018 10:57:02 -0700
Subject: [PATCH] Refactor git-credential-manager.exe handling to clean up code

---
 src/Package/GitComponents.wxs          | 24 ++++++++++++++++++++++++
 src/Package/GitCredStoreComponents.wxs | 14 --------------
 src/Package/GitProduct.wxs             |  9 ++++++++-
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/Package/GitComponents.wxs b/src/Package/GitComponents.wxs
index 6aee91f..57f7e42 100644
--- a/src/Package/GitComponents.wxs
+++ b/src/Package/GitComponents.wxs
@@ -10,4 +10,28 @@
       </Component>
     </ComponentGroup>
   </Fragment>
+
+  <Fragment>
+    <ComponentGroup Id='GitCredentialManager' Directory='GitCoreFolder'>
+      <Component>
+        <fg:HarvestFile Source='..\..\files\mingw32\libexec\git-core\git-credential-manager.exe'
+                        KeyIdentifier='CredManagerFile' />
+      </Component>
+    </ComponentGroup>
+
+    <CustomActionRef Id='InstallGitCredentialManager' />
+  </Fragment>
+
+  <Fragment>
+    <SetProperty Id='InstallGitCredentialManager' Value='"[#CredManagerFile]" config --global credential.helper manager'
+                 Before='InstallGitCredentialManager' Sequence='execute' />
+    <CustomAction Id='InstallGitCredentialManager' BinaryKey='WixCA' DllEntry='WixQuietExec'
+                  Execute='deferred' Return='ignore' Impersonate='yes'/>
+
+    <PropertyRef Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" />
+
+    <InstallExecuteSequence>
+        <Custom Action='InstallGitCredentialManager' Before='InstallFinalize'>NOT Installed AND WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED</Custom>
+    </InstallExecuteSequence>
+  </Fragment>
 </Wix>
diff --git a/src/Package/GitCredStoreComponents.wxs b/src/Package/GitCredStoreComponents.wxs
index 6017654..d0b75eb 100644
--- a/src/Package/GitCredStoreComponents.wxs
+++ b/src/Package/GitCredStoreComponents.wxs
@@ -11,7 +11,6 @@
         </ComponentGroup>
 
         <CustomActionRef Id='InstallGitCredentials' />
-        <CustomActionRef Id='InstallGitCredentialManager' />
     </Fragment>
 
     <Fragment>
@@ -32,17 +31,4 @@
             <Custom Action='InstallGitCredentials' Before='InstallFinalize'>NOT Installed AND NOT WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED</Custom>
         </InstallExecuteSequence>
     </Fragment>
-
-    <Fragment>
-        <SetProperty Id='InstallGitCredentialManager' Value='"[#fil65820BAC8645ECCA80F578593ABCC673]" config --system credential.helper manager'
-                     Before='InstallGitCredentialManager' Sequence='execute' />
-        <CustomAction Id='InstallGitCredentialManager' BinaryKey='WixCA' DllEntry='WixQuietExec'
-                      Execute='deferred' Return='ignore' Impersonate='yes'/>
-
-        <PropertyRef Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" />
-
-        <InstallExecuteSequence>
-            <Custom Action='InstallGitCredentialManager' Before='InstallFinalize'>NOT Installed AND WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED</Custom>
-        </InstallExecuteSequence>
-    </Fragment>
 </Wix>
diff --git a/src/Package/GitProduct.wxs b/src/Package/GitProduct.wxs
index 071fb7d..ea68a0c 100644
--- a/src/Package/GitProduct.wxs
+++ b/src/Package/GitProduct.wxs
@@ -20,6 +20,7 @@
       </Component>
 
       <ComponentGroupRef Id='GitComponents'/>
+      <ComponentGroupRef Id='GitCredentialManager'/>
       <ComponentGroupRef Id='GitCredStoreComponents'/>
       <ComponentGroupRef Id='GitPoshComponents'/>
     </Feature>
@@ -28,7 +29,13 @@
   <Fragment>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
-        <Directory Id='INSTALLFOLDER' Name='Git' />
+        <Directory Id='INSTALLFOLDER' Name='Git'>
+          <Directory Id='Mingw32Folder' Name='mingw32'>
+            <Directory Id='LibexecFolder' Name='libexec'>
+              <Directory Id='GitCoreFolder' Name='git-core' />
+            </Directory>
+          </Directory>
+        </Directory>
       </Directory>
     </Directory>
   </Fragment>