Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Dec 3, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
839ff54
use strings.Cut and update comments
WeidiDeng Dec 3, 2024
b60259e
update the comment to reflex the actual value
WeidiDeng Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions builder.go
View file
Open in desktop
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
Loading