Commit 2ee5a8dc authored by Tomasz Maczukin's avatar Tomasz Maczukin

Merge branch '4163-change-default-windows-shell' into 'master'

Make PowerShell default for new registered Windows shell executors

See merge request !1406
parents c5b6e3ea 4cc0c4b7
Pipeline #65504701 failed with stages
in 60 minutes and 27 seconds
......@@ -5,6 +5,7 @@ import (
"fmt"
"os"
"os/signal"
"runtime"
"strings"
"github.com/sirupsen/logrus"
......@@ -271,6 +272,11 @@ func (s *RegisterCommand) askExecutorOptions() {
s.askVirtualBox()
s.askSSHLogin()
},
"shell": func() {
if runtime.GOOS == "windows" {
s.Shell = "powershell"
}
},
}
executorFn, ok := executorFns[s.Executor]
......
......@@ -274,6 +274,7 @@ func (b *CmdShell) GenerateScript(buildStage common.BuildStage, info common.Shel
}
func (b *CmdShell) IsDefault() bool {
// TODO: Remove in 13.0 - Make PowerShell default shell for Windows.
return runtime.GOOS == "windows"
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment