Skip to content

fix(template): use path.Join and rename parameter to fix embed path on Windows #1391

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 1 commit into from
Oct 16, 2025
Merged

fix(template): use path.Join and rename parameter to fix embed path on Windows #1391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

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: 5 additions & 3 deletions internal/template/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package template
import (
"bufio"
"bytes"

"github.com/0xJacky/Nginx-UI/internal/nginx"
"github.com/0xJacky/Nginx-UI/settings"
templ "github.com/0xJacky/Nginx-UI/template"
Expand All @@ -12,8 +13,9 @@ import (
"github.com/tufanbarisyildirim/gonginx/parser"
"github.com/uozi-tech/cosy/logger"
cSettings "github.com/uozi-tech/cosy/settings"

"io"
"path/filepath"
dirPath "path"
"strings"
"text/template"
)
Expand All @@ -39,7 +41,7 @@ func GetTemplateInfo(path, name string) (configListItem ConfigInfoItem) {
Filename: name,
}

file, err := templ.DistFS.Open(filepath.Join(path, name))
file, err := templ.DistFS.Open(dirPath.Join(path, name))
if err != nil {
logger.Error(err)
return
Expand Down Expand Up @@ -83,7 +85,7 @@ type ConfigDetail struct {
}

func ParseTemplate(path, name string, bindData map[string]Variable) (c ConfigDetail, err error) {
file, err := templ.DistFS.Open(filepath.Join(path, name))
file, err := templ.DistFS.Open(dirPath.Join(path, name))
if err != nil {
err = errors.Wrap(err, "error tokenized template")
return
Expand Down