From 1f3b7e86ef3e454c4655442111bd313adc1e4974 Mon Sep 17 00:00:00 2001 From: Chase Sterling Date: Fri, 28 Jul 2023 09:44:04 -0400 Subject: [PATCH] chore(tools): Fix doc inclusion tools on Windows (#13685) --- tools/config_includer/generator.go | 4 ++-- tools/readme_config_includer/generator.go | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/config_includer/generator.go b/tools/config_includer/generator.go index 1dc2d05d6..0f57c4908 100644 --- a/tools/config_includer/generator.go +++ b/tools/config_includer/generator.go @@ -91,7 +91,7 @@ func main() { newUnresolved := make(map[string]string) for name, fn := range unresolved { - if filepath.IsAbs(fn) { + if strings.HasPrefix(filepath.ToSlash(fn), "/") { fn = filepath.Join(root, fn) } @@ -121,7 +121,7 @@ func main() { pwd = string(filepath.Separator) + pwd for _, iname := range extractIncludes(tmpl) { ifn := iname - if !filepath.IsAbs(ifn) { + if !strings.HasPrefix(ifn, "/") { ifn = filepath.Join(pwd, ifn) } newUnresolved[iname] = ifn diff --git a/tools/readme_config_includer/generator.go b/tools/readme_config_includer/generator.go index 7c3a9c72d..4c225e095 100644 --- a/tools/readme_config_includer/generator.go +++ b/tools/readme_config_includer/generator.go @@ -52,10 +52,9 @@ func extractIncludeBlock(txt []byte, includesEx *regexp.Regexp, root string) *in if len(inc) != 2 { continue } - include := filepath.FromSlash(string(inc[1])) + include := string(inc[1]) // Make absolute paths relative to the include-root if any - // Check original value to avoid platform specific slashes - if filepath.IsAbs(string(inc[1])) { + if strings.HasPrefix(include, "/") { if root == "" { log.Printf("Ignoring absolute include %q without include root...", include) continue