Skip to content

Commit

Permalink
chore: use strings.Cut and update comments when determining local cad…
Browse files Browse the repository at this point in the history
…dy replacement version (#218)

* use strings.Cut and update comments

* update the comment to reflex the actual value
  • Loading branch information
WeidiDeng authored Dec 3, 2024
1 parent cd13e2a commit eb894be
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
version := strings.TrimSpace(strings.TrimPrefix(buffer.String(), buildEnv.caddyModulePath))
index := strings.Index(version, "=>")
if index != -1 {
version = strings.TrimSpace(version[:index])
}
version := strings.TrimPrefix(buffer.String(), buildEnv.caddyModulePath)
// if caddy replacement is a local directory, version will be
// like v2.8.4 => c:\Users\test\caddy
// 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)
if err != nil {
return err
Expand Down

0 comments on commit eb894be

Please sign in to comment.