From d10bd8d3ee7270bcfcd2a12a228e53505aacd94d Mon Sep 17 00:00:00 2001
From: Chawye Hsu <su+git@chawyehsu.com>
Date: Thu, 25 Apr 2024 20:02:32 +0800
Subject: [PATCH 1/2] fix(core): Fix `Invoke-ExternalCommand` regression
 (#5923)

Co-authored-by: Hsiao-nan Cheung <niheaven@gmail.com>
---
 CHANGELOG.md                    |  6 ++++++
 lib/core.ps1                    | 11 ++++++++---
 test/Scoop-Decompress.Tests.ps1 | 28 +++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00e336583e..bb6770b6c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [Unreleased](https://github.com/ScoopInstaller/Scoop/compare/master...develop)
+
+### Bug Fixes
+
+- **core:** Fix `Invoke-ExternalCommand` regression ([#5923](https://github.com/ScoopInstaller/Scoop/issues/5923))
+
 ## [v0.4.0](https://github.com/ScoopInstaller/Scoop/compare/v0.3.1...v0.4.0) - 2024-04-18
 
 ### Features
diff --git a/lib/core.ps1 b/lib/core.ps1
index cf60f27e4c..1ac304ded5 100644
--- a/lib/core.ps1
+++ b/lib/core.ps1
@@ -747,9 +747,14 @@ function Invoke-ExternalCommand {
     }
     if ($ArgumentList.Length -gt 0) {
         $ArgumentList = $ArgumentList | ForEach-Object { [regex]::Split($_.Replace('"', ''), '(?<=(?<![:\w])[/-]\w+) | (?=[/-])') }
-        if ($FilePath -match '^((cmd|cscript|wscript|msiexec)(\.exe)?|.*\.(bat|cmd|js|vbs|wsf))$') {
-            $Process.StartInfo.Arguments = $ArgumentList -join ' '
-        } elseif ($Process.StartInfo.ArgumentList.Add) {
+        # Use legacy argument escaping for commands having non-standard behavior
+        # with regard to argument passing. `msiexec` requires some args like
+        # `TARGETDIR="C:\Program Files"`, which is non-standard, therefore we
+        # treat it as a legacy command.
+        # ref-1: https://learn.microsoft.com/en-us/powershell/scripting/learn/experimental-features?view=powershell-7.4#psnativecommandargumentpassing
+        $LegacyCommand = $FilePath -match '^((cmd|cscript|find|sqlcmd|wscript|msiexec)(\.exe)?|.*\.(bat|cmd|js|vbs|wsf))$'
+        $SupportArgumentList = $Process.StartInfo.PSObject.Properties.Name -contains 'ArgumentList'
+        if ((-not $LegacyCommand) -and $SupportArgumentList) {
             # ArgumentList is supported in PowerShell 6.1 and later (built on .NET Core 2.1+)
             # ref-1: https://docs.microsoft.com/en-us/dotnet/api/system.diagnostics.processstartinfo.argumentlist?view=net-6.0
             # ref-2: https://docs.microsoft.com/en-us/powershell/scripting/whats-new/differences-from-windows-powershell?view=powershell-7.2#net-framework-vs-net-core
diff --git a/test/Scoop-Decompress.Tests.ps1 b/test/Scoop-Decompress.Tests.ps1
index b4cc1ef2d1..a293961ab6 100644
--- a/test/Scoop-Decompress.Tests.ps1
+++ b/test/Scoop-Decompress.Tests.ps1
@@ -158,11 +158,13 @@ Describe 'Decompression function' -Tag 'Scoop', 'Windows', 'Decompress' {
             } elseif (!(installed lessmsi)) {
                 scoop install lessmsi
             }
+            Copy-Item "$working_dir\MSITest.msi" "$working_dir\MSI Test.msi"
             $test1 = "$working_dir\MSITest.msi"
-            $test2 = "$working_dir\MSITestNull.msi"
+            $test2 = "$working_dir\MSI Test.msi"
+            $test3 = "$working_dir\MSITestNull.msi"
         }
 
-        It 'extract normal MSI file' {
+        It 'extract normal MSI file using msiexec' {
             Mock get_config { $false }
             $to = test_extract 'Expand-MsiArchive' $test1
             $to | Should -Exist
@@ -170,12 +172,32 @@ Describe 'Decompression function' -Tag 'Scoop', 'Windows', 'Decompress' {
             (Get-ChildItem "$to\MSITest").Count | Should -Be 1
         }
 
-        It 'extract empty MSI file using lessmsi' {
+        It 'extract normal MSI file with whitespace in path using msiexec' {
+            Mock get_config { $false }
+            $to = test_extract 'Expand-MsiArchive' $test2
+            $to | Should -Exist
+            "$to\MSITest\empty" | Should -Exist
+            (Get-ChildItem "$to\MSITest").Count | Should -Be 1
+        }
+
+        It 'extract normal MSI file using lessmsi' {
+            Mock get_config { $true }
+            $to = test_extract 'Expand-MsiArchive' $test1
+            $to | Should -Exist
+        }
+
+        It 'extract normal MSI file with whitespace in path using lessmsi' {
             Mock get_config { $true }
             $to = test_extract 'Expand-MsiArchive' $test2
             $to | Should -Exist
         }
 
+        It 'extract empty MSI file using lessmsi' {
+            Mock get_config { $true }
+            $to = test_extract 'Expand-MsiArchive' $test3
+            $to | Should -Exist
+        }
+
         It 'works with "-Removal" switch ($removal param)' {
             Mock get_config { $false }
             $test1 | Should -Exist

From a0d6132976e98c97c844686b80370fbf6d362668 Mon Sep 17 00:00:00 2001
From: Chawye Hsu <su+git@chawyehsu.com>
Date: Thu, 25 Apr 2024 20:07:11 +0800
Subject: [PATCH 2/2] docs(changelog): Prepare release

Signed-off-by: Chawye Hsu <su+git@chawyehsu.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb6770b6c0..d6e1f79248 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [Unreleased](https://github.com/ScoopInstaller/Scoop/compare/master...develop)
+## [v0.4.1](https://github.com/ScoopInstaller/Scoop/compare/v0.4.0...v0.4.1) - 2024-04-25
 
 ### Bug Fixes