From b0c663c9bc8065d73412a442d8672f4fe59cffa0 Mon Sep 17 00:00:00 2001
From: Ayman Bagabas <ayman.bagabas@gmail.com>
Date: Fri, 4 Nov 2022 17:32:34 -0400
Subject: [PATCH] fix(pwsh): add powershell shell

pwsh is only added on newer versions of PowerShell which might not be
pre-installed in Windows 10
---
 shell.go       |  7 ++++++-
 tty_windows.go | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/shell.go b/shell.go
index 5c9bb794..e096e56c 100644
--- a/shell.go
+++ b/shell.go
@@ -5,7 +5,8 @@ const (
 	bash       = "bash"
 	cmdexe     = "cmd"
 	fish       = "fish"
-	powershell = "pwsh"
+	powershell = "powershell"
+	pwsh       = "pwsh"
 	zsh        = "zsh"
 )
 
@@ -30,6 +31,10 @@ var Shells = map[string]Shell{
 		Command: `clear; fish --login --private -C 'function fish_greeting; end' -C '%s'`,
 	},
 	powershell: {
+		Prompt:  "Function prompt {Write-Host \"> \" -ForegroundColor Blue -NoNewLine; return \"`0\" }",
+		Command: ` clear; powershell -NoLogo -NoExit -Command 'Set-PSReadLineOption -HistorySaveStyle SaveNothing; %s'`,
+	},
+	pwsh: {
 		Prompt:  "Function prompt {Write-Host \"> \" -ForegroundColor Blue -NoNewLine; return \"`0\" }",
 		Command: ` clear; pwsh -Login -NoLogo -NoExit -Command 'Set-PSReadLineOption -HistorySaveStyle SaveNothing; %s'`,
 	},
diff --git a/tty_windows.go b/tty_windows.go
index 0b82bf52..bf0c7521 100644
--- a/tty_windows.go
+++ b/tty_windows.go
@@ -3,15 +3,23 @@
 
 package main
 
-import "golang.org/x/sys/windows"
+import (
+	"os/exec"
 
-const defaultShell = powershell
+	"golang.org/x/sys/windows"
+)
+
+var defaultShell = cmdexe
 
 func defaultShellWithArgs() []string {
 	major, _, _ := windows.RtlGetNtVersionNumbers()
 	if major >= 10 {
-		return []string{"powershell"}
+		if _, err := exec.LookPath("pwsh"); err == nil {
+			defaultShell = pwsh
+		} else {
+			defaultShell = powershell
+		}
 	}
 
-	return []string{"cmd"}
+	return []string{defaultShell}
 }