11package cli
22
33import (
4- "golang.org/x/xerrors "
4+ "fmt "
55
66"github.com/coder/coder/v2/cli/cliui"
77"github.com/coder/serpent"
@@ -31,26 +31,30 @@ func (*RootCmd) completion() *serpent.Command {
3131},
3232Handler :func (inv * serpent.Invocation )error {
3333if shellName != "" {
34- shell := completion .ShellByName (shellName ,inv .Command .Parent .Name ())
35- if shell = =nil {
36- return xerrors . Errorf ( "unsupported shell %q" , shellName )
34+ shell , err := completion .ShellByName (shellName ,inv .Command .Parent .Name ())
35+ if err ! =nil {
36+ return err
3737}
38+ if printOutput {
39+ return shell .WriteCompletion (inv .Stdout )
40+ }
41+ return installCompletion (inv ,shell )
42+ }
43+ shell ,err := completion .DetectUserShell (inv .Command .Parent .Name ())
44+ if err == nil {
3845return installCompletion (inv ,shell )
3946}
40- // shell, err := completion.DetectUserShell(inv.Command.Parent.Name())
41- // if err == nil {
42- // return installCompletion(inv, shell)
43- // }
47+ // Silently continue to the shell selection if detecting failed.
4448choice ,err := cliui .Select (inv , cliui.SelectOptions {
45- Message :"Select a shell to install completion for" ,
49+ Message :"Select a shell to install completion for: " ,
4650Options :shellOptions .Choices ,
4751})
4852if err != nil {
4953return err
5054}
51- shellChoice := completion .ShellByName (choice ,inv .Command .Parent .Name ())
52- if shellChoice = =nil {
53- return xerrors . Errorf ( "unsupported shell %q" , shellName )
55+ shellChoice , err := completion .ShellByName (choice ,inv .Command .Parent .Name ())
56+ if err ! =nil {
57+ return err
5458}
5559if printOutput {
5660return shellChoice .WriteCompletion (inv .Stdout )
@@ -66,13 +70,17 @@ func installCompletion(inv *serpent.Invocation, shell completion.Shell) error {
6670// If we can't determine the install path, just print the completion script.
6771return shell .WriteCompletion (inv .Stdout )
6872}
73+ action := "appending to"
74+ if shell .UsesOwnFile () {
75+ action = "creating"
76+ }
6977choice ,err := cliui .Select (inv , cliui.SelectOptions {
7078Options : []string {
7179"Confirm" ,
7280"Print to terminal" ,
7381"Cancel" ,
7482},
75- Message :"Install completion for" + shell .Name ()+ " by appending to " + path + "?" ,
83+ Message :fmt . Sprintf ( "Install completion for%s by %s %s?" , shell .Name (), action , path ) ,
7684HideSearch :true ,
7785})
7886if err != nil {
@@ -81,7 +89,7 @@ func installCompletion(inv *serpent.Invocation, shell completion.Shell) error {
8189if choice == "Cancel" {
8290return nil
8391}
84- if choice ! ="Print to terminal" {
92+ if choice = ="Print to terminal" {
8593return shell .WriteCompletion (inv .Stdout )
8694}
8795return completion .InstallShellCompletion (shell )