Merge branch 'pr1023' into stable

* pr1023: (GH-676) Fix: Unzip specific folder feature is broken
chocolatey · Mar 17, 2017 · 845a604 · 845a604
2 parents e991fbc + 3b13869
commit 845a604
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1 b/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1
@@ -80,9 +80,6 @@ param(
   [parameter(ValueFromRemainingArguments = $true)][Object[]] $ignoredArguments
 )
   $zipfileFullPath=$fileFullPath
-  if ($specificfolder) {
-    $fileFullPath=join-path $fileFullPath $specificFolder
-  }
 
   Write-FunctionCallLogMessage -Invocation $MyInvocation -Parameters $PSBoundParameters
 
@@ -123,6 +120,9 @@ param(
   }
 
   $params = "x -aoa -bd -bb1 -o`"$destinationNoRedirection`" -y `"$fileFullPathNoRedirection`""
+  if ($specificfolder) {
+    $params += " `"$specificfolder`""
+  }
   Write-Debug "Executing command ['$7zip' $params]"
 
   # Capture 7z's output into a StringBuilder and write it out in blocks, to improve I/O performance.