Commit 76d3161e authored by Adam Reese's avatar Adam Reese Committed by GitHub

Merge pull request #2673 from adamreese/fix/2630-helm-home

fix(helm): load home from flags during runtime
parents 0a20ed73 dd952e61
...@@ -62,9 +62,7 @@ type createCmd struct { ...@@ -62,9 +62,7 @@ type createCmd struct {
} }
func newCreateCmd(out io.Writer) *cobra.Command { func newCreateCmd(out io.Writer) *cobra.Command {
cc := &createCmd{ cc := &createCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "create NAME", Use: "create NAME",
......
...@@ -108,9 +108,8 @@ type dependencyListCmd struct { ...@@ -108,9 +108,8 @@ type dependencyListCmd struct {
} }
func newDependencyListCmd(out io.Writer) *cobra.Command { func newDependencyListCmd(out io.Writer) *cobra.Command {
dlc := &dependencyListCmd{ dlc := &dependencyListCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "list [flags] CHART", Use: "list [flags] CHART",
Aliases: []string{"ls"}, Aliases: []string{"ls"},
......
...@@ -45,9 +45,7 @@ type dependencyBuildCmd struct { ...@@ -45,9 +45,7 @@ type dependencyBuildCmd struct {
} }
func newDependencyBuildCmd(out io.Writer) *cobra.Command { func newDependencyBuildCmd(out io.Writer) *cobra.Command {
dbc := &dependencyBuildCmd{ dbc := &dependencyBuildCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "build [flags] CHART", Use: "build [flags] CHART",
......
...@@ -52,9 +52,7 @@ type dependencyUpdateCmd struct { ...@@ -52,9 +52,7 @@ type dependencyUpdateCmd struct {
// newDependencyUpdateCmd creates a new dependency update command. // newDependencyUpdateCmd creates a new dependency update command.
func newDependencyUpdateCmd(out io.Writer) *cobra.Command { func newDependencyUpdateCmd(out io.Writer) *cobra.Command {
duc := &dependencyUpdateCmd{ duc := &dependencyUpdateCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "update [flags] CHART", Use: "update [flags] CHART",
......
...@@ -82,9 +82,7 @@ type initCmd struct { ...@@ -82,9 +82,7 @@ type initCmd struct {
} }
func newInitCmd(out io.Writer) *cobra.Command { func newInitCmd(out io.Writer) *cobra.Command {
i := &initCmd{ i := &initCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "init", Use: "init",
......
...@@ -64,9 +64,7 @@ type packageCmd struct { ...@@ -64,9 +64,7 @@ type packageCmd struct {
} }
func newPackageCmd(out io.Writer) *cobra.Command { func newPackageCmd(out io.Writer) *cobra.Command {
pkg := &packageCmd{ pkg := &packageCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "package [flags] [CHART_PATH] [...]", Use: "package [flags] [CHART_PATH] [...]",
......
...@@ -41,9 +41,7 @@ type repoAddCmd struct { ...@@ -41,9 +41,7 @@ type repoAddCmd struct {
} }
func newRepoAddCmd(out io.Writer) *cobra.Command { func newRepoAddCmd(out io.Writer) *cobra.Command {
add := &repoAddCmd{ add := &repoAddCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "add [flags] [NAME] [URL]", Use: "add [flags] [NAME] [URL]",
......
...@@ -45,9 +45,7 @@ type repoIndexCmd struct { ...@@ -45,9 +45,7 @@ type repoIndexCmd struct {
} }
func newRepoIndexCmd(out io.Writer) *cobra.Command { func newRepoIndexCmd(out io.Writer) *cobra.Command {
index := &repoIndexCmd{ index := &repoIndexCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "index [flags] [DIR]", Use: "index [flags] [DIR]",
......
...@@ -34,9 +34,7 @@ type repoListCmd struct { ...@@ -34,9 +34,7 @@ type repoListCmd struct {
} }
func newRepoListCmd(out io.Writer) *cobra.Command { func newRepoListCmd(out io.Writer) *cobra.Command {
list := &repoListCmd{ list := &repoListCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "list [flags]", Use: "list [flags]",
......
...@@ -34,9 +34,7 @@ type repoRemoveCmd struct { ...@@ -34,9 +34,7 @@ type repoRemoveCmd struct {
} }
func newRepoRemoveCmd(out io.Writer) *cobra.Command { func newRepoRemoveCmd(out io.Writer) *cobra.Command {
remove := &repoRemoveCmd{ remove := &repoRemoveCmd{out: out}
out: out,
}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "remove [flags] [NAME]", Use: "remove [flags] [NAME]",
......
...@@ -37,9 +37,7 @@ Information is cached locally, where it is used by commands like 'helm search'. ...@@ -37,9 +37,7 @@ Information is cached locally, where it is used by commands like 'helm search'.
future releases. future releases.
` `
var ( var errNoRepositories = errors.New("no repositories found. You must add one before updating")
errNoRepositories = errors.New("no repositories found. You must add one before updating")
)
type repoUpdateCmd struct { type repoUpdateCmd struct {
update func([]*repo.ChartRepository, io.Writer, helmpath.Home) update func([]*repo.ChartRepository, io.Writer, helmpath.Home)
......
...@@ -50,13 +50,14 @@ type searchCmd struct { ...@@ -50,13 +50,14 @@ type searchCmd struct {
} }
func newSearchCmd(out io.Writer) *cobra.Command { func newSearchCmd(out io.Writer) *cobra.Command {
sc := &searchCmd{out: out, helmhome: settings.Home} sc := &searchCmd{out: out}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "search [keyword]", Use: "search [keyword]",
Short: "search for a keyword in charts", Short: "search for a keyword in charts",
Long: searchDesc, Long: searchDesc,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
sc.helmhome = settings.Home
return sc.run(args) return sc.run(args)
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment