Mirrors/xcaddy
1
0
Fork 0
mirror of https://github.com/caddyserver/xcaddy.git synced 2024-11-03 07:50:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resolve relative replacements

Browse source 
This allows us to use user-defined replacements that have a
relative path, since our temporary modules exist in different dirs.
This commit is contained in:
Matthew Holt 2021-01-19 14:49:54 -07:00
parent a9fc1ead03
commit 623c361726
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmd/xcaddy/main.go
View file

@ -175,7 +175,7 @@ func runDev(ctx context.Context, args []string) error {
// and since this tool is a carry-through for the user's actual // and since this tool is a carry-through for the user's actual
// go.mod, we need to transfer their replace directives through // go.mod, we need to transfer their replace directives through
// to the one we're making // to the one we're making
cmd = exec.Command("go", "list", "-m", "-f={{if .Replace}}{{.Path}} => {{.Replace}}{{end}}", "all") cmd = exec.Command("go", "list", "-m", "-f={{if .Replace}}{{.Path}}=>{{.Replace}}{{end}}", "all")
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
out, err = cmd.Output() out, err = cmd.Output()
if err != nil { if err != nil {
@ -186,10 +186,14 @@ func runDev(ctx context.Context, args []string) error {
if len(parts) != 2 || parts[0] == "" || parts[1] == "" { if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
continue continue
} }
replacements = append(replacements, xcaddy.NewReplace(
strings.TrimSpace(parts[0]), // adjust relative replacements in original module since our temporary module is in a different directory
strings.TrimSpace(parts[1]), if !filepath.IsAbs(parts[1]) {
)) parts[1] = filepath.Join(moduleDir, parts[1])
log.Printf("[INFO] Resolved relative replacement %s to %s", line, parts[1])
}
replacements = append(replacements, xcaddy.NewReplace(parts[0], parts[1]))
} }
// reconcile remaining path segments; for example if a module foo/a // reconcile remaining path segments; for example if a module foo/a