Mirrors/xcaddy
1
0
Fork 0
mirror of https://github.com/caddyserver/xcaddy.git synced 2025-02-02 06:07:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Extract correct version when using --with flag to replace Caddy core (#216)

Browse source
This commit is contained in:
jshenguru 2024-12-01 12:53:17 -05:00 committed by GitHub
parent c548f44e2d
commit c0aca26dd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builder.go
View file

@ -107,6 +107,10 @@ func (b Builder) Build(ctx context.Context, outputFile string) error {
// output looks like: github.com/caddyserver/caddy/v2 v2.7.6 // output looks like: github.com/caddyserver/caddy/v2 v2.7.6
version := strings.TrimSpace(strings.TrimPrefix(buffer.String(), buildEnv.caddyModulePath)) version := strings.TrimSpace(strings.TrimPrefix(buffer.String(), buildEnv.caddyModulePath))
index := strings.Index(version, "=>")
if index != -1 {
version = strings.TrimSpace(version[:index])
}
err = utils.WindowsResource(version, outputFile, buildEnv.tempFolder) err = utils.WindowsResource(version, outputFile, buildEnv.tempFolder)
if err != nil { if err != nil {
return err return err