From 0865dbbf7532a06c6a028e089ae46d0ec2708a92 Mon Sep 17 00:00:00 2001 From: John Guo Date: Mon, 29 May 2023 16:29:42 +0800 Subject: [PATCH] improve command up for goframe version upgrade (#2670) --- cmd/gf/internal/cmd/cmd_up.go | 6 ++++-- version.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/gf/internal/cmd/cmd_up.go b/cmd/gf/internal/cmd/cmd_up.go index f009894cf..a0882a63d 100644 --- a/cmd/gf/internal/cmd/cmd_up.go +++ b/cmd/gf/internal/cmd/cmd_up.go @@ -11,11 +11,11 @@ import ( "fmt" "runtime" - "github.com/gogf/gf/cmd/gf/v2/internal/utility/utils" - "github.com/gogf/gf/v2/container/gset" "github.com/minio/selfupdate" "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/utils" + "github.com/gogf/gf/v2/container/gset" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gfile" "github.com/gogf/gf/v2/os/gproc" @@ -125,6 +125,8 @@ func (c cUp) doUpgradeVersion(ctx context.Context, in cUpInput) (out *doUpgradeV if gfile.Exists(goModPath) { var packages []Package err = gfile.ReadLines(goModPath, func(line string) error { + line = gstr.Trim(line) + line = gstr.TrimLeftStr(line, "require ") line = gstr.Trim(line) if gstr.HasPrefix(line, gfPackage) { array := gstr.SplitAndTrim(line, " ") diff --git a/version.go b/version.go index 29b5d97a9..9fb1de78f 100644 --- a/version.go +++ b/version.go @@ -2,5 +2,5 @@ package gf const ( // VERSION is the current GoFrame version. - VERSION = "v2.4.1" + VERSION = "v2.4.2" )