Mirrors/xcaddy
1
0
Fork 0
mirror of https://github.com/caddyserver/xcaddy.git synced 2025-03-22 05:19:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

cmd: handle replacements in --with

Browse source 
Fixes #201
This commit is contained in:
Mohammed Al Sahaf 2024-09-11 10:28:31 +00:00 committed by GitHub
parent ef4158623f
commit b72e330d5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cmd/commands.go
View file

@ -74,7 +74,7 @@ Flags:
return fmt.Errorf("unable to parse --replace arguments: %s", err.Error()) return fmt.Errorf("unable to parse --replace arguments: %s", err.Error())
} }
for _, withArg := range withArgs { for _, withArg := range withArgs {
mod, ver, _, err := splitWith(withArg) mod, ver, repl, err := splitWith(withArg)
if err != nil { if err != nil {
return err return err
} }
@ -83,6 +83,7 @@ Flags:
PackagePath: mod, PackagePath: mod,
Version: ver, Version: ver,
}) })
handleReplace(withArg, mod, ver, repl, &replacements)
} }
for _, withArg := range replaceArgs { for _, withArg := range replaceArgs {
@ -90,15 +91,7 @@ Flags:
if err != nil { if err != nil {
return err return err
} }
// adjust relative replacements in current working directory since our temporary module is in a different directory handleReplace(withArg, mod, ver, repl, &replacements)
if strings.HasPrefix(repl, ".") {
repl, err = filepath.Abs(repl)
if err != nil {
log.Fatalf("[FATAL] %v", err)
}
log.Printf("[INFO] Resolved relative replacement %s to %s", withArg, repl)
}
replacements = append(replacements, xcaddy.NewReplace(xcaddy.Dependency{PackagePath: mod, Version: ver}.String(), repl))
} }
output, err = cmd.Flags().GetString("output") output, err = cmd.Flags().GetString("output")
@ -187,3 +180,18 @@ Flags:
return nil return nil
}, },
} }
func handleReplace(orig, mod, ver, repl string, replacements *[]xcaddy.Replace) {
if repl != "" {
// adjust relative replacements in current working directory since our temporary module is in a different directory
if strings.HasPrefix(repl, ".") {
var err error
repl, err = filepath.Abs(repl)
if err != nil {
log.Fatalf("[FATAL] %v", err)
}
log.Printf("[INFO] Resolved relative replacement %s to %s", orig, repl)
}
*replacements = append(*replacements, xcaddy.NewReplace(xcaddy.Dependency{PackagePath: mod, Version: ver}.String(), repl))
}
}