Skip to content

Add a command argument for choosing shell #24

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add a command argument for choosing shell #24

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
22 changes: 16 additions & 6 deletions completion_install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ import (

// InstallCompletions is a kong command for installing or uninstalling shell completions
type InstallCompletions struct {
Shell string `arg:"" name:"shell" optional:"" help:"The shell to install completion for. If not provided, the user's login shell will be used."`
Uninstall bool
}

// BeforeApply installs completion into the users shell.
func (c *InstallCompletions) BeforeApply(ctx *kong.Context) error {
err := installCompletionFromContext(ctx)
func (c *InstallCompletions) AfterApply(ctx *kong.Context) error {
err := c.installCompletionFromContext(ctx)
if err != nil {
return err
}
Expand All @@ -41,11 +42,20 @@ complete -f -c ${cmd} -a "(__complete_${cmd})"
}

// installCompletionFromContext writes shell completion for the given command.
func installCompletionFromContext(ctx *kong.Context) error {
shell, err := loginshell.Shell()
if err != nil {
return fmt.Errorf("couldn't determine user's shell: %w", err)
func (c *InstallCompletions) installCompletionFromContext(ctx *kong.Context) error {
var shell string
var err error

// If the user provided a shell, use that. Otherwise, use the user's login shell.
if c.Shell != "" {
shell = c.Shell
} else {
shell, err = loginshell.Shell()
if err != nil {
return fmt.Errorf("couldn't determine user's shell: %w", err)
}
}

bin, err := os.Executable()
if err != nil {
return fmt.Errorf("couldn't find absolute path to ourselves: %w", err)
Expand Down