msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #3695 from bacongobbler/windows-path-issues

Browse Source 
fix windows path issues on `helm template -x`
pull/3705/head
Matthew Fisher 7 years ago committed by GitHub
parent a53f93c8ee 6de9ebccbc
commit 4711d5b8b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
cmd/helm/template.go
Unescape View File

@ -122,7 +122,7 @@ func (t *templateCmd) run(cmd *cobra.Command, args []string) error {
if len(t.renderFiles) > 0 { if len(t.renderFiles) > 0 {
for _, f := range t.renderFiles { for _, f := range t.renderFiles {
if !filepath.IsAbs(f) { if !filepath.IsAbs(f) {
af, err = filepath.Abs(t.chartPath + "/" + f) af, err = filepath.Abs(filepath.Join(t.chartPath, f))
if err != nil { if err != nil {
return fmt.Errorf("could not resolve template path: %s", err) return fmt.Errorf("could not resolve template path: %s", err)
} }
@ -232,9 +232,9 @@ func (t *templateCmd) run(cmd *cobra.Command, args []string) error {
} }
in := func(needle string, haystack []string) bool { in := func(needle string, haystack []string) bool {
// make needle path absolute // make needle path absolute
d := strings.Split(needle, "/") d := strings.Split(needle, string(os.PathSeparator))
dd := d[1:] dd := d[1:]
an := t.chartPath + "/" + strings.Join(dd, "/") an := filepath.Join(t.chartPath, strings.Join(dd, string(os.PathSeparator)))
for _, h := range haystack { for _, h := range haystack {
if h == an { if h == an {

Write Preview
Loading…
Cancel
Save