From 3c109fb5fdd9be863572eee53c170651ff255892 Mon Sep 17 00:00:00 2001 From: Reinier Criel Date: Mon, 27 Oct 2025 15:19:48 -0700 Subject: [PATCH] Fix issue seen during Windows testing --- .../shell-integration/startup-scripts/init-pwsh.ps1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/safe-chain/src/shell-integration/startup-scripts/init-pwsh.ps1 b/packages/safe-chain/src/shell-integration/startup-scripts/init-pwsh.ps1 index eeeb459..b467d9e 100644 --- a/packages/safe-chain/src/shell-integration/startup-scripts/init-pwsh.ps1 +++ b/packages/safe-chain/src/shell-integration/startup-scripts/init-pwsh.ps1 @@ -99,8 +99,9 @@ function pip3 { function python { param([Parameter(ValueFromRemainingArguments=$true)]$Args) if ($Args.Length -ge 2 -and $Args[0] -eq '-m' -and $Args[1] -match '^pip(3)?$') { - if ($Args[1] -eq 'pip3') { Invoke-WrappedCommand 'pip3' 'aikido-pip3' $Args[2..($Args.Length-1)] } - else { Invoke-WrappedCommand 'pip' 'aikido-pip' $Args[2..($Args.Length-1)] } + $pipArgs = if ($Args.Length -gt 2) { $Args | Select-Object -Skip 2 } else { @() } + if ($Args[1] -eq 'pip3') { Invoke-WrappedCommand 'pip3' 'aikido-pip3' $pipArgs } + else { Invoke-WrappedCommand 'pip' 'aikido-pip' $pipArgs } } else { Invoke-RealCommand 'python' $Args @@ -111,8 +112,9 @@ function python { function python3 { param([Parameter(ValueFromRemainingArguments=$true)]$Args) if ($Args.Length -ge 2 -and $Args[0] -eq '-m' -and $Args[1] -match '^pip(3)?$') { - if ($Args[1] -eq 'pip3') { Invoke-WrappedCommand 'pip3' 'aikido-pip3' $Args[2..($Args.Length-1)] } - else { Invoke-WrappedCommand 'pip' 'aikido-pip' $Args[2..($Args.Length-1)] } + $pipArgs = if ($Args.Length -gt 2) { $Args | Select-Object -Skip 2 } else { @() } + if ($Args[1] -eq 'pip3') { Invoke-WrappedCommand 'pip3' 'aikido-pip3' $pipArgs } + else { Invoke-WrappedCommand 'pip' 'aikido-pip' $pipArgs } } else { Invoke-RealCommand 'python3' $Args