diff options
| author | John W. Parent <45471568+johnwparent@users.noreply.github.com> | 2022-03-22 12:42:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 09:42:21 -0700 |
| commit | a14901f79288bb739aa5a2e056c085759327a97b (patch) | |
| tree | 944d78791c93e039899fb1c2265ee6f11b2efcc0 | |
| parent | 9177f223c3a27994430838e458024519e37e5729 (diff) | |
| download | spack-a14901f79288bb739aa5a2e056c085759327a97b.tar.gz spack-a14901f79288bb739aa5a2e056c085759327a97b.tar.bz2 spack-a14901f79288bb739aa5a2e056c085759327a97b.tar.xz spack-a14901f79288bb739aa5a2e056c085759327a97b.zip | |
Windows PWSH setup fix (#29649)
A command in the script to make Spack accessible in PWSH was invoked with
multiple arguments when it in fact requires a single argument.
| -rw-r--r-- | bin/spack_pwsh.ps1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/spack_pwsh.ps1 b/bin/spack_pwsh.ps1 index 199d33038c..9747fd3254 100644 --- a/bin/spack_pwsh.ps1 +++ b/bin/spack_pwsh.ps1 @@ -37,8 +37,8 @@ if (!$null -eq $py_path) if (!$null -eq $py_exe) { - Invoke-Expression "$py_exe" "$Env:SPACK_ROOT\bin\haspywin.py" - Invoke-Expression "$py_exe" "$Env:SPACK_ROOT\bin\spack external find python" | Out-Null + Invoke-Expression "$py_exe $Env:SPACK_ROOT\bin\haspywin.py" + Invoke-Expression "$py_exe $Env:SPACK_ROOT\bin\spack external find python" | Out-Null } $Env:Path = "$Env:SPACK_ROOT\bin;$Env:Path" @@ -54,6 +54,6 @@ $command = 'function global:prompt $pth = $(Convert-Path $(Get-Location)) | Split-Path -leaf "[spack] PS $pth>" }' -$bytes = [System.Text.Encoding]::Unicode.GetBytes($command) -$encoded_command = [Convert]::ToBase64String($bytes) +$bytesc = [System.Text.Encoding]::Unicode.GetBytes($command) +$encoded_command = [Convert]::ToBase64String($bytesc) powershell.exe -NoLogo -encodedCommand $encoded_command -NoExit |