(git.install) use file names directly when installing

closes #1351
chocolatey-community · Oct 23, 2019 · 44be1a7 · 44be1a7
1 parent f7c2a02
commit 44be1a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/automatic/git.install/tools/chocolateyInstall.ps1 b/automatic/git.install/tools/chocolateyInstall.ps1
@@ -8,16 +8,18 @@ Set-InstallerRegistrySettings $pp
 
 Stop-GitSSHAgent
 
+$fileName32 = 'Git-2.23.0-32-bit.exe'
+$fileName64 = 'Git-2.23.0-64-bit.exe'
 $packageArgs = @{
     PackageName    = 'git.install'
     FileType       = 'exe'
     SoftwareName   = 'Git version *'
-    File           = Get-Item $toolsPath\*-32-bit.exe
-    File64         = Get-Item $toolsPath\*-64-bit.exe
+    File           = Get-Item $toolsPath\$fileName32
+    File64         = Get-Item $toolsPath\$fileName64
     SilentArgs     = "/VERYSILENT", "/SUPPRESSMSGBOXES", "/NORESTART", "/NOCANCEL", "/SP-", "/LOG", (Get-InstallComponents $pp)
 }
 Install-ChocolateyInstallPackage @packageArgs
-Get-ChildItem $toolsPath\*.exe | ForEach-Object { Remove-Item $_ -ea 0; if (Test-Path $_) { Set-Content "$_.ignore" '' } }
+Get-ChildItem $toolsPath\$fileName32, $toolsPath\$fileName64 | ForEach-Object { Remove-Item $_ -ea 0; if (Test-Path $_) { Set-Content "$_.ignore" '' } }
 
 $packageName = $packageArgs.packageName
 $installLocation = Get-AppInstallLocation $packageArgs.SoftwareName

diff --git a/automatic/git.install/update.ps1 b/automatic/git.install/update.ps1
@@ -6,6 +6,11 @@ $releases = "$domain/git-for-windows/git/releases/latest"
 function global:au_BeforeUpdate { Get-RemoteFiles -Purge -NoSuffix }
 function global:au_SearchReplace {
     @{
+        ".\tools\chocolateyInstall.ps1" = @{
+            "(^[$]fileName32\s*=\s*)('.*')" = "`$1'$($Latest.FileName32)'"
+            "(^[$]fileName64\s*=\s*)('.*')" = "`$1'$($Latest.FileName64)'"
+        }
+
         ".\legal\verification.txt" = @{
             "(?i)(32-Bit.+)\<.*\>" = "`${1}<$($Latest.URL32)>"
             "(?i)(64-Bit.+)\<.*\>" = "`${1}<$($Latest.URL64)>"