diff options
| -rw-r--r-- | modules/svg/discover_bindata.go | 3 | ||||
| -rw-r--r-- | modules/svg/discover_nobindata.go | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/modules/svg/discover_bindata.go b/modules/svg/discover_bindata.go index 51fd8a4a6c..1f7af0c9f8 100644 --- a/modules/svg/discover_bindata.go +++ b/modules/svg/discover_bindata.go @@ -7,7 +7,6 @@ package svg import ( - "path" "path/filepath" "code.gitea.io/gitea/modules/public" @@ -22,7 +21,7 @@ func Discover() map[string]string { if matched { content, err := public.Asset(file) if err == nil { - filename := path.Base(file) + filename := filepath.Base(file) svgs[filename[:len(filename)-4]] = string(content) } } diff --git a/modules/svg/discover_nobindata.go b/modules/svg/discover_nobindata.go index 04ce447de8..d667da2d66 100644 --- a/modules/svg/discover_nobindata.go +++ b/modules/svg/discover_nobindata.go @@ -8,7 +8,6 @@ package svg import ( "io/ioutil" - "path" "path/filepath" "code.gitea.io/gitea/modules/setting" @@ -18,11 +17,11 @@ import ( func Discover() map[string]string { svgs := make(map[string]string) - files, _ := filepath.Glob(path.Join(setting.StaticRootPath, "public", "img", "svg", "*.svg")) + files, _ := filepath.Glob(filepath.Join(setting.StaticRootPath, "public", "img", "svg", "*.svg")) for _, file := range files { content, err := ioutil.ReadFile(file) if err == nil { - filename := path.Base(file) + filename := filepath.Base(file) svgs[filename[:len(filename)-4]] = string(content) } } |