feat(compress): Allow 'Expand-InnoArchive -ExtractDir' to accept '{xxx}' (#3487)

niheaven · r15ch13 · commit 81e3cf61b6a2 · 2019-05-30T14:55:48.000+02:00
diff --git a/lib/decompress.ps1 b/lib/decompress.ps1
@@ -180,7 +180,12 @@ function Expand-InnoArchive {
         $Removal
     )
     $LogPath = "$(Split-Path $Path)\innounp.log"
-    $ArgList = @('-x', "-d`"$DestinationPath`"", "-c`{app`}\$ExtractDir", "`"$Path`"", '-y')
+    $ArgList = @('-x', "-d`"$DestinationPath`"", "`"$Path`"", '-y')
+    switch -Regex ($ExtractDir) {
+        "^[^{].*" { $ArgList += "-c{app}\$ExtractDir" }
+        "^{.*" { $ArgList += "-c$ExtractDir" }
+        Default { $ArgList += "-c{app}" }
+    }
     if ($Switches) {
         $ArgList += (-split $Switches)
     }

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,12 @@ function Expand-InnoArchive {`
`180`	`180`	`$Removal`
`181`	`181`	`)`
`182`	`182`	`$LogPath = "$(Split-Path $Path)\innounp.log"`
`183`		- $ArgList = @('-x', "-d`"$DestinationPath`"", "-c`{app`}\$ExtractDir", "`"$Path`"", '-y')
	`183`	+ $ArgList = @('-x', "-d`"$DestinationPath`"", "`"$Path`"", '-y')
	`184`	`+ switch -Regex ($ExtractDir) {`
	`185`	`+ "^[^{].*" { $ArgList += "-c{app}\$ExtractDir" }`
	`186`	`+ "^{.*" { $ArgList += "-c$ExtractDir" }`
	`187`	`+ Default { $ArgList += "-c{app}" }`
	`188`	`+ }`
`184`	`189`	`if ($Switches) {`
`185`	`190`	`$ArgList += (-split $Switches)`
`186`	`191`	`}`