Merge pull request #44 from mikebattista/mikebattista/PSNativeCommand…

…ArgumentPassing Fixed regression caused by PowerShell 7.3 breaking change
mikebattista · Nov 16, 2022 · 2c8dc7a · 2c8dc7a
2 parents 8686e1f + 42f5846
commit 2c8dc7a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/WslInterop.psd1 b/WslInterop.psd1
@@ -12,7 +12,7 @@
 RootModule = '.\WslInterop.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.4.0'
+ModuleVersion = '0.4.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'

diff --git a/WslInterop.psm1 b/WslInterop.psm1
@@ -90,9 +90,25 @@ function global:Import-WslCommand() {
         `$distribution = ("-d `$(`$WslDefaultParameterValues."-d")", "")[`$WslDefaultParameterValues."-d" -eq `$null]
         `$username = ("-u `$(`$WslDefaultParameterValues."-u")", "")[`$WslDefaultParameterValues."-u" -eq `$null]
         `$environmentVariables = ((`$WslEnvironmentVariables.Keys | ForEach-Object { "`$_='`$(`$WslEnvironmentVariables."`$_")'" }), "")[`$WslEnvironmentVariables.Count -eq 0]
-        `$defaultArgs = (`$WslDefaultParameterValues."$_", "")[`$WslDefaultParameterValues.Disabled -eq `$true]
+        `$defaultArgs = (`$WslDefaultParameterValues."$_", "")[`$WslDefaultParameterValues."$_" -eq `$null -or `$WslDefaultParameterValues.Disabled -eq `$true]
         if (`$defaultArgs -is [scriptblock]) { `$defaultArgs = . `$defaultArgs }
-        `$commandLine = "`$distribution `$username `$environmentVariables $_ `$defaultArgs `$args" -split ' '
+        
+        `$commandLine = ""
+        if (`$distribution -ne "") {
+            `$commandLine += "`$distribution "
+        }
+        if (`$username -ne "") {
+            `$commandLine += "`$username "
+        }
+        if (`$environmentVariables -ne "") {
+            `$commandLine += "`$environmentVariables "
+        }
+        `$commandLine += "$_ "
+        if (`$defaultArgs -ne "") {
+            `$commandLine += "`$defaultArgs "
+        }
+        `$commandLine += "`$args"
+        `$commandLine = "`$commandLine".Trim() -split ' '
 
         # Invoke the command.
         if (`$input.MoveNext()) {