Merge pull request #1509 from gep13/issue-1415

(GH-1415) Correct issue with remove zip file contents
chocolatey · Feb 26, 2018 · 96522e4 · 96522e4
2 parents 5ddcb20 + 67d4ad1
commit 96522e4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1 b/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1
@@ -64,7 +64,14 @@ param(
   Write-FunctionCallLogMessage -Invocation $MyInvocation -Parameters $PSBoundParameters
 
   $packagelibPath=$env:chocolateyPackageFolder
-  $zipContentFile=(join-path $packagelibPath $zipFileName) + ".txt"
+  $zipContentFile=(join-path $packagelibPath $zipFileName) + "Install.txt"
+
+  # The Zip Content File may have previously existed under a different
+  # name.  If *Install.txt doesn't exist, check for the old name
+  if(-Not (Test-Path -Path $zipFileContentPath)) {
+    $zipContentFile=(Join-Path $packagelibPath -ChildPath $zipFileName) + ".txt"
+  }
+
   if ((Test-Path -path $zipContentFile)) {
     $zipContentFile
     $zipContents=get-content $zipContentFile