diff --git a/info.go b/info.go index 337e6639..d6c966c3 100644 --- a/info.go +++ b/info.go @@ -305,7 +305,7 @@ func (m *Message) FileURI(dir string) string { dir = strings.TrimPrefix(dir, Info.Make.Path) } else if strings.HasPrefix(dir, p) { dir = strings.TrimPrefix(dir, p) - } else if strings.HasPrefix(dir, pp) { + } else if strings.Contains(p, "usr/local/work") && strings.HasPrefix(dir, pp) { dir = strings.TrimPrefix(dir, pp) } else if strings.HasPrefix(dir, ISH_PLUGED) { dir = strings.TrimPrefix(dir, ISH_PLUGED) diff --git a/render.go b/render.go index 07c5a952..8517507e 100644 --- a/render.go +++ b/render.go @@ -256,13 +256,13 @@ func (m *Message) Display(file string, arg ...Any) *Message { } func (m *Message) Resource(file string) string { return m.resource(file) } func (m *Message) resource(file string) string { - if strings.HasPrefix(file, PS) || strings.HasPrefix(file, HTTP) { - return file - } - p := strings.TrimPrefix(kit.FileLines(3), Info.Make.Path) - if p = strings.TrimPrefix(p, kit.Path("")+PS); strings.Contains(p, "/pkg/mod/") { - p = strings.Split(p, "/pkg/mod/")[1] - } - kit.If(file == "", func() { p = kit.ExtChange(p, JS) }, func() { p = path.Join(path.Dir(p), file) }) - return kit.MergeURL("/require/"+p, POD, m.Option(MSG_USERPOD)) + p := kit.FileLines(3) + kit.If(file == "", func() { p = kit.ExtChange(p, JS) }, func() { + if strings.HasPrefix(file, PS) { + p = file + } else { + p = path.Join(path.Dir(p), file) + } + }) + return m.FileURI(p) }