docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1117 from ehazlett/fix-windows-shell-detection 

windows: fix shell detection to not bail on bash envs
This commit is contained in:
Evan Hazlett 2015-05-06 15:54:37 -07:00
parent ce0e365e10 c4dd9198c1
commit 7aa8364a4a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands/commands.go
View File

@ -612,8 +612,8 @@ func getCertPathInfo(c *cli.Context) libmachine.CertPathInfo {
func detectShell() (string, error) {
// attempt to get the SHELL env var
shell := filepath.Base(os.Getenv("SHELL"))
// none detected; check for windows env
if runtime.GOOS == "windows" {
// none detected; check for windows env and not bash (i.e. msysgit, etc)
if runtime.GOOS == "windows" && shell == "" {
log.Printf("On Windows, please specify either 'cmd' or 'powershell' with the --shell flag.\n\n")
return "", ErrUnknownShell
}