Skip to content

[alias] Add no-prefix flag #2012

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
merged 2 commits into from
Apr 20, 2024
Merged

[alias] Add no-prefix flag #2012

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a16dbc
[alias] Add no-prefix flag
mikeland73 Apr 19, 2024
3a8a116
Improve comment
mikeland73 Apr 20, 2024
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
23 changes: 16 additions & 7 deletions internal/boxcli/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"regexp"

"github.com/pkg/errors"
"github.com/samber/lo"
"github.com/spf13/cobra"

"go.jetpack.io/devbox/internal/boxcli/usererr"
Expand All @@ -34,8 +35,9 @@ type GenerateReadmeCmdFlags struct {
}

type GenerateAliasCmdFlags struct {
config configFlags
prefix string
config configFlags
prefix string
noPrefix bool
}

func generateCmd() *cobra.Command {
Expand Down Expand Up @@ -201,6 +203,10 @@ func genAliasCmd() *cobra.Command {
"Usage is typically `eval \"$(devbox gen alias)\"`.",
Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error {
if flags.prefix != "" && flags.noPrefix {
return usererr.New(
"Cannot use both --prefix and --no-prefix flags together")
}
box, err := devbox.Open(&devopt.Opts{
Dir: flags.config.path,
Stderr: cmd.ErrOrStderr(),
Expand All @@ -210,17 +216,17 @@ func genAliasCmd() *cobra.Command {
}
re := regexp.MustCompile("[^a-zA-Z0-9_-]+")
prefix := cmp.Or(flags.prefix, box.Config().Root.Name)
if prefix == "" {
if prefix == "" && !flags.noPrefix {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

return usererr.New(
					"To generate aliases, you must specify a prefix or set a name " +
						"in devbox.json, or use `--no-prefix` flag")

?

return usererr.New(
"To generate aliases, you must specify a prefix or set a name " +
"in devbox.json")
"To generate aliases, you must specify a prefix, set a name " +
"in devbox.json, or use the --no-prefix flag.")
}
prefix = re.ReplaceAllString(prefix, "-")
for _, script := range box.ListScripts() {
fmt.Fprintf(
cmd.OutOrStdout(),
"alias %s-%s='devbox -c \"%s\" run %s'\n",
prefix,
"alias %s%s='devbox -c \"%s\" run %s'\n",
lo.Ternary(flags.noPrefix, "", prefix+"-"),
script,
box.ProjectDir(),
script,
Expand All @@ -232,6 +238,9 @@ func genAliasCmd() *cobra.Command {
flags.config.register(command)
command.Flags().StringVarP(
&flags.prefix, "prefix", "p", "", "Prefix for the generated aliases")
command.Flags().BoolVar(
&flags.noPrefix, "no-prefix", false,
"Do not use a prefix for the generated aliases")

return command
}
Expand Down