Skip to content

Clean Path in Options #23006

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 4 commits into from
Mar 8, 2023
+8 −8
Merged

Clean Path in Options #23006

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe7a402
Clean Path in Options
JakobDev Feb 20, 2023
1ff2628
Fiy typo
JakobDev Feb 20, 2023
fc54a44
fix: use path.Clean("/"+name)
wolfogre Mar 8, 2023
7a218a9
Merge branch 'main' into optionspathclean
wolfogre Mar 8, 2023
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
8 changes: 4 additions & 4 deletions modules/options/dynamic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,22 @@ func WalkLocales(callback func(path, name string, d fs.DirEntry, err error) erro

// Readme reads the content of a specific readme from static or custom path.
func Readme(name string) ([]byte, error) {
return fileFromDir(path.Join("readme", name))
return fileFromDir(path.Join("readme", path.Base(name)))
}

// Gitignore reads the content of a specific gitignore from static or custom path.
func Gitignore(name string) ([]byte, error) {
return fileFromDir(path.Join("gitignore", name))
return fileFromDir(path.Join("gitignore", path.Base(name)))
}

// License reads the content of a specific license from static or custom path.
func License(name string) ([]byte, error) {
return fileFromDir(path.Join("license", name))
return fileFromDir(path.Join("license", path.Base(name)))
}

// Labels reads the content of a specific labels from static or custom path.
func Labels(name string) ([]byte, error) {
return fileFromDir(path.Join("label", name))
return fileFromDir(path.Join("label", path.Base(name)))
}

// fileFromDir is a helper to read files from static or custom path.
Expand Down
8 changes: 4 additions & 4 deletions modules/options/static.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,22 @@ func WalkLocales(callback func(path, name string, d fs.DirEntry, err error) erro

// Readme reads the content of a specific readme from bindata or custom path.
func Readme(name string) ([]byte, error) {
return fileFromDir(path.Join("readme", name))
return fileFromDir(path.Join("readme", path.Base(name)))
}

// Gitignore reads the content of a gitignore locale from bindata or custom path.
func Gitignore(name string) ([]byte, error) {
return fileFromDir(path.Join("gitignore", name))
return fileFromDir(path.Join("gitignore", path.Base(name)))
}

// License reads the content of a specific license from bindata or custom path.
func License(name string) ([]byte, error) {
return fileFromDir(path.Join("license", name))
return fileFromDir(path.Join("license", path.Base(name)))
}

// Labels reads the content of a specific labels from static or custom path.
func Labels(name string) ([]byte, error) {
return fileFromDir(path.Join("label", name))
return fileFromDir(path.Join("label", path.Base(name)))
}

// fileFromDir is a helper to read files from bindata or custom path.
Expand Down