diff options
| -rw-r--r-- | mesonbuild/mdevenv.py | 5 | ||||
| -rw-r--r-- | mesonbuild/scripts/cmd_or_ps.ps1 | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/mdevenv.py b/mesonbuild/mdevenv.py index 041d22d..46b301c 100644 --- a/mesonbuild/mdevenv.py +++ b/mesonbuild/mdevenv.py @@ -185,9 +185,8 @@ def run(options: argparse.Namespace) -> int: args = [shell_env] elif is_windows(): shell = get_windows_shell() - if shell == 'powershell.exe': - args = ['powershell.exe'] - args += ['-NoLogo', '-NoExit'] + if shell in ['powershell.exe', 'pwsh.exe']: + args = [shell, '-NoLogo', '-NoExit'] prompt = f'function global:prompt {{ "{prompt_prefix} PS " + $PWD + "> "}}' args += ['-Command', prompt] else: diff --git a/mesonbuild/scripts/cmd_or_ps.ps1 b/mesonbuild/scripts/cmd_or_ps.ps1 index 884d7e0..1d677d9 100644 --- a/mesonbuild/scripts/cmd_or_ps.ps1 +++ b/mesonbuild/scripts/cmd_or_ps.ps1 @@ -5,7 +5,7 @@ $i=1 $ppid=(gwmi win32_process -Filter "processid='$pid'").parentprocessid $pname=(Get-Process -id $ppid).Name While($true) { - if($pname -eq "cmd" -Or $pname -eq "powershell") { + if($pname -eq "cmd" -Or $pname -eq "powershell" -Or $pname -eq "pwsh") { Write-Host ("{0}.exe" -f $pname) Break } |