mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-22 17:34:03 +03:00
Fix filepath basename on Windows for SVG bindata (#12241)
This commit is contained in:
parent
84a419de98
commit
633f52c220
@ -7,7 +7,6 @@
|
|||||||
package svg
|
package svg
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"path"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/public"
|
"code.gitea.io/gitea/modules/public"
|
||||||
@ -22,7 +21,7 @@ func Discover() map[string]string {
|
|||||||
if matched {
|
if matched {
|
||||||
content, err := public.Asset(file)
|
content, err := public.Asset(file)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
filename := path.Base(file)
|
filename := filepath.Base(file)
|
||||||
svgs[filename[:len(filename)-4]] = string(content)
|
svgs[filename[:len(filename)-4]] = string(content)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,6 @@ package svg
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"path"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
@ -18,11 +17,11 @@ import (
|
|||||||
func Discover() map[string]string {
|
func Discover() map[string]string {
|
||||||
svgs := make(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 {
|
for _, file := range files {
|
||||||
content, err := ioutil.ReadFile(file)
|
content, err := ioutil.ReadFile(file)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
filename := path.Base(file)
|
filename := filepath.Base(file)
|
||||||
svgs[filename[:len(filename)-4]] = string(content)
|
svgs[filename[:len(filename)-4]] = string(content)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user