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

chore: use strings.Cut and update comments when determining local caddy replacement version (#218)

Browse source 
* use strings.Cut and update comments

* update the comment to reflex the actual value
This commit is contained in:
WeidiDeng 2024-12-04 01:12:17 +08:00 committed by GitHub
parent cd13e2ade3
commit eb894be6a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
builder.go
View file

@ -106,11 +106,13 @@ 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.TrimPrefix(buffer.String(), buildEnv.caddyModulePath)
index := strings.Index(version, "=>") // if caddy replacement is a local directory, version will be
if index != -1 { // like v2.8.4 => c:\Users\test\caddy
version = strings.TrimSpace(version[:index]) // see https://github.com/caddyserver/xcaddy/issues/215
} // strings.Cut return the string unchanged if separator is not found
version, _, _ = strings.Cut(version, "=>")
version = strings.TrimSpace(version)
err = utils.WindowsResource(version, outputFile, buildEnv.tempFolder) err = utils.WindowsResource(version, outputFile, buildEnv.tempFolder)
if err != nil { if err != nil {
return err return err