Skip to content

Add shellType parameter to force a specific shell (bash or pwsh) #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yangl900 merged 1 commit into from
May 21, 2019
+8 −2
Merged

Add shellType parameter to force a specific shell (bash or pwsh) #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ import (
)

func main() {
var tenantID string
var tenantID, shellType string
var reset, help bool
flag.StringVar(&tenantID, "tenant", "", "Specify the tenant Id.")
flag.BoolVar(&reset, "reset", false, "Reset the presisted tenant settings.")
flag.BoolVar(&help, "help", false, "Show the help text.")
flag.StringVar(&shellType,"shelltype","","Force to request the specified shell type (bash|pwsh)")
flag.Parse()

if help {
Expand Down Expand Up @@ -101,7 +102,12 @@ func main() {
return
}

t, err := RequestTerminal(tenantID, uri, css.Properties.PreferredShellType)
if ((shellType != "pwsh") && (shellType != "bash")) {
shellType = css.Properties.PreferredShellType
}


t, err := RequestTerminal(tenantID, uri, shellType)
if err != nil || t.SocketURI == "" {
fmt.Println("Failed to connect to cloud shell terminal.", err)
return
Expand Down