(GH-1323) rename file to downloadFilePath

chocolatey · Jun 6, 2017 · 67f8ac5 · 67f8ac5
1 parent 8f29ae0
commit 67f8ac5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1
@@ -299,9 +299,9 @@ param(
   $tempDir = $tempDir -replace '\\chocolatey\\chocolatey\\', '\chocolatey\'
 
   if (![System.IO.Directory]::Exists($tempDir)) { [System.IO.Directory]::CreateDirectory($tempDir) | Out-Null }
-  $file = Join-Path $tempDir "$($packageName)Install.$fileType"
+  $downloadFilePath = Join-Path $tempDir "$($packageName)Install.$fileType"
 
-  [string]$filePath = $file
+  [string]$filePath = $downloadFilePath
   if ($useOriginalLocation) {
     $filePath = $url
     if (Get-ProcessorBits 64) {
@@ -316,7 +316,7 @@ param(
     }
   } else {
     $filePath = Get-ChocolateyWebFile -PackageName $packageName `
-                                      -FileFullPath $file `
+                                      -FileFullPath $downloadFilePath `
                                       -Url $url `
                                       -Url64bit $url64bit `
                                       -Checksum $checksum `

diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1
@@ -198,10 +198,10 @@ param(
   $tempDir = Join-Path $chocTempDir "$($env:chocolateyPackageName)"
   if ($env:chocolateyPackageVersion -ne $null) {$tempDir = Join-Path $tempDir "$($env:chocolateyPackageVersion)"; }
   $tempDir = $tempDir -replace '\\chocolatey\\chocolatey\\', '\chocolatey\'
+  if (![System.IO.Directory]::Exists($tempDir)) { [System.IO.Directory]::CreateDirectory($tempDir) | Out-Null }
+  $downloadFilePath = Join-Path $tempDir "$($packageName)Install.$fileType"
 
-  if (![System.IO.Directory]::Exists($tempDir)) {[System.IO.Directory]::CreateDirectory($tempDir) | Out-Null}
-  $file = Join-Path $tempDir "$($packageName)Install.$fileType"
 
-  $filePath = Get-ChocolateyWebFile $packageName $file $url $url64bit -checkSum $checkSum -checksumType $checksumType -checkSum64 $checkSum64 -checksumType64 $checksumType64 -options $options -getOriginalFileName
+  $filePath = Get-ChocolateyWebFile $packageName $downloadFilePath $url $url64bit -checkSum $checkSum -checksumType $checksumType -checkSum64 $checkSum64 -checksumType64 $checksumType64 -options $options -getOriginalFileName
   Get-ChocolateyUnzip "$filePath" $unzipLocation $specificFolder $packageName
 }