Skip to content

Commit 12fdf93

Browse files
seungha-yangGStreamer Marge Bot
authored andcommitted
gst-env: Add support for PowerShell 7
The executable binary name of "PowerShell 7" is "pwsh.exe" which is different from system default installed "Windows PowerShell (version 5.x or older)" Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2545>
1 parent 77937f9 commit 12fdf93

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

data/misc/cmd_or_ps.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $i=1
22
$ppid=(gwmi win32_process -Filter "processid='$pid'").parentprocessid
33
$pname=(Get-Process -id $ppid).Name
44
While($true) {
5-
if($pname -eq "cmd" -Or $pname -eq "powershell") {
5+
if($pname -eq "cmd" -Or $pname -eq "powershell" -Or $pname -eq "pwsh") {
66
Write-Host ("{0}.exe" -f $pname)
77
Break
88
}

gst-env.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,8 @@ def get_windows_shell():
549549
env = get_subprocess_env(options, gst_version)
550550
if os.name == 'nt':
551551
shell = get_windows_shell()
552-
if shell == 'powershell.exe':
553-
new_args = ['powershell.exe']
554-
new_args += ['-NoLogo']
552+
if shell in ['powershell.exe', 'pwsh.exe']:
553+
new_args = [shell, '-NoLogo']
555554
if not args:
556555
prompt = 'function global:prompt { "[gst-' + gst_version + '"+"] PS " + $PWD + "> "}'
557556
new_args += ['-NoExit', '-Command', prompt]

0 commit comments

Comments
 (0)