From eb894be6a004097e5ef67db4d8bcdb579d8ae1b8 Mon Sep 17 00:00:00 2001 From: WeidiDeng Date: Wed, 4 Dec 2024 01:12:17 +0800 Subject: [PATCH] chore: use strings.Cut and update comments when determining local caddy replacement version (#218) * use strings.Cut and update comments * update the comment to reflex the actual value --- builder.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/builder.go b/builder.go index cc9990f..728439e 100644 --- a/builder.go +++ b/builder.go @@ -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