diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/spack/setup-env.ps1 | 4 | ||||
| -rwxr-xr-x | share/spack/spack-completion.bash | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/share/spack/setup-env.ps1 b/share/spack/setup-env.ps1 index edf9613ec5..d3bed93d9b 100644 --- a/share/spack/setup-env.ps1 +++ b/share/spack/setup-env.ps1 @@ -46,6 +46,10 @@ if ($null -eq $Env:EDITOR) $Env:EDITOR = "notepad" } +# Set spack shell so we can detect powershell context +$Env:SPACK_SHELL="pwsh" + +doskey /exename=powershell.exe spack=$Env:SPACK_ROOT\bin\spack.ps1 $args Write-Output "*****************************************************************" Write-Output "**************** Spack Package Manager **************************" diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash index abf41cb052..2e98698e0f 100755 --- a/share/spack/spack-completion.bash +++ b/share/spack/spack-completion.bash @@ -935,7 +935,7 @@ _spack_env() { _spack_env_activate() { if $list_options then - SPACK_COMPREPLY="-h --help --sh --csh --fish --bat -v --with-view -V --without-view -p --prompt --temp -d --dir" + SPACK_COMPREPLY="-h --help --sh --csh --fish --bat --pwsh -v --with-view -V --without-view -p --prompt --temp -d --dir" else _environments fi |