knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: support windows paths in embedded templates FS

This commit is contained in:
Luke Kingland 2021-03-29 23:03:43 +09:00
parent acc56b0900
commit c2b216857b
No known key found for this signature in database
GPG Key ID: 4896F75BAF2E1966
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tarfs/tarfs.go
View File

@ -5,6 +5,7 @@ import (
"bytes" "bytes"
"io" "io"
"io/fs" "io/fs"
"os"
"path" "path"
"sort" "sort"
"strings" "strings"
@ -71,7 +72,7 @@ func (fsys FS) Open(name string) (fs.File, error) {
if name == "." { if name == "." {
elem = "." elem = "."
for fname, f := range fsys { for fname, f := range fsys {
i := strings.Index(fname, "/") i := strings.Index(fname, string(os.PathSeparator))
if i < 0 { if i < 0 {
list = append(list, fileInfo{fname, f}) list = append(list, fileInfo{fname, f})
} else { } else {
@ -79,12 +80,12 @@ func (fsys FS) Open(name string) (fs.File, error) {
} }
} }
} else { } else {
elem = name[strings.LastIndex(name, "/")+1:] elem = name[strings.LastIndex(name, string(os.PathSeparator))+1:]
prefix := name + "/" prefix := name + string(os.PathSeparator)
for fname, f := range fsys { for fname, f := range fsys {
if strings.HasPrefix(fname, prefix) { if strings.HasPrefix(fname, prefix) {
felem := fname[len(prefix):] felem := fname[len(prefix):]
i := strings.Index(felem, "/") i := strings.Index(felem, string(os.PathSeparator))
if i < 0 { if i < 0 {
list = append(list, fileInfo{felem, f}) list = append(list, fileInfo{felem, f})
} else { } else {