From 5854dd192da901a67715ca9ed28d913d7c1d3b51 Mon Sep 17 00:00:00 2001
From: copperyp <copperyp@gmail.com>
Date: Wed, 27 Oct 2021 14:40:58 +0800
Subject: [PATCH] using path.Join replace filepath.Join
Signed-off-by: copperyp <copperyp@gmail.com>
---
server/templates.go | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/templates.go b/server/templates.go
index 13e3bfc8..9be8019a 100644
--- a/server/templates.go
+++ b/server/templates.go
@@ -8,7 +8,6 @@ import (
"net/http"
"net/url"
"path"
- "path/filepath"
"sort"
"strings"
@@ -109,7 +108,7 @@ func loadWebConfig(c webConfig) (http.Handler, http.Handler, *templates, error)
if err != nil {
return nil, nil, nil, fmt.Errorf("read static dir: %v", err)
}
- themeFiles, err := fs.Sub(c.webFS, filepath.ToSlash(filepath.Join("themes", c.theme)))
+ themeFiles, err := fs.Sub(c.webFS, path.Join("themes", c.theme))
if err != nil {
return nil, nil, nil, fmt.Errorf("read themes dir: %v", err)
}
@@ -133,7 +132,7 @@ func loadTemplates(c webConfig, templatesDir string) (*templates, error) {
if file.IsDir() {
continue
}
- filenames = append(filenames, filepath.ToSlash(filepath.Join(templatesDir, file.Name())))
+ filenames = append(filenames, path.Join(templatesDir, file.Name()))
}
if len(filenames) == 0 {
return nil, fmt.Errorf("no files in template dir %q", templatesDir)
--
GitLab