Skip to content

Commit 8999afd

Browse files
committed
Merge branch 'master' of https://github.com/loft-sh/devspace into print-feat
2 parents 667c937 + 3f24490 commit 8999afd

19 files changed

Lines changed: 2613 additions & 576 deletions

File tree

cmd/completion.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ const (
1818
$ brew install bash-completion
1919
$ source $(brew --prefix)/etc/bash_completion
2020
$ devspace completion bash > ~/.devspace-completion # for bash users
21+
$ devspace completion fish > ~/.devspace-completion # for fish users
2122
$ devspace completion zsh > ~/.devspace-completion # for zsh users
2223
$ source ~/.devspace-completion
2324
Ubuntu:
2425
$ apt-get install bash-completion
2526
$ source /etc/bash-completion
2627
$ source <(devspace completion bash) # for bash users
28+
$ devspace completion fish | source # for fish users
2729
$ source <(devspace completion zsh) # for zsh users
2830
2931
Additionally, you may want to output the completion to a file and source in your .bashrc
@@ -42,7 +44,7 @@ func NewCompletionCmd() *cobra.Command {
4244
}
4345
return cobra.OnlyValidArgs(cmd, args)
4446
},
45-
ValidArgs: []string{"bash", "zsh"},
47+
ValidArgs: []string{"bash", "fish", "zsh"},
4648
Short: "Outputs shell completion for the given shell (bash or zsh)",
4749
Long: longDescription,
4850
RunE: completion,
@@ -53,6 +55,8 @@ func completion(cmd *cobra.Command, args []string) error {
5355
switch args[0] {
5456
case "bash":
5557
return rootCmd(cmd).GenBashCompletion(os.Stdout)
58+
case "fish":
59+
return rootCmd(cmd).GenFishCompletion(os.Stdout, true)
5660
case "zsh":
5761
err := rootCmd(cmd).GenZshCompletion(os.Stdout)
5862
if err != nil {

cmd/run_pipeline.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ func initialize(ctx context.Context, f factory.Factory, options *CommandOptions,
343343
}
344344

345345
// resolve dependencies
346-
dependencies, err := f.NewDependencyManager(devCtx, options.ConfigOptions).ResolveAll(devCtx, dependency.ResolveOptions{})
346+
dependencies, err := f.NewDependencyManager(devCtx, options.ConfigOptions).ResolveAll(devCtx, dependency.ResolveOptions{SkipDependencies: options.DependencyOptions.Exclude})
347347
if err != nil {
348348
return nil, errors.Wrap(err, "deploy dependencies")
349349
}

0 commit comments

Comments
 (0)