Merge pull request #338 from YangSen-qn/dev

Fix version error

Author: Mei-Zhao

Makefile

@@ -6,7 +6,7 @@ DARWIN=qshell-$(VERSION)-darwin-x64
 LINUX86=qshell-$(VERSION)-linux-x86
 LINUX64=qshell-$(VERSION)-linux-x64
 LINUXARM=qshell-$(VERSION)-linux-arm
-LDFLAGS='-X 'github.com/qiniu/qshell/iqshell/common/version.Version=$(VERSION)' -extldflags '-static''
+LDFLAGS='-X 'github.com/qiniu/qshell/v2/iqshell/common/version.version=$(VERSION)' -extldflags '-static''
 GO=GO111MODULE=on go
 
 all: linux windows arm darwin

cmd/root.go

@@ -44,7 +44,7 @@ var rootCmdBuilder = func(cfg *iqshell.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                    "qshell",
 		Short:                  "Qiniu commandline tool for managing your bucket and CDN",
-		Version:                version.Version,
+		Version:                version.Version(),
 		BashCompletionFunction: bash_completion_func,
 	}
 	cmd.PersistentFlags().BoolVarP(&cfg.StdoutColorful, "colorful", "", false, "console colorful mode")

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/qiniu/go-sdk/v7 v7.10.1
 	github.com/schollz/progressbar/v3 v3.8.6
+	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.7.0
@@ -32,7 +33,6 @@ require (
 	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
 	github.com/spf13/afero v1.5.1 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
@@ -43,7 +43,7 @@ require (
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
 	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+	gopkg.in/yaml.v3 v3.0.0 // indirect
 )
 
 go 1.17

go.sum

@@ -472,8 +472,9 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

iqshell/common/utils/user_agent.go

@@ -8,5 +8,5 @@ import (
 
 // 生成客户端代理名称
 func UserAgent() string {
-	return fmt.Sprintf("QShell/%s (%s; %s; %s)", version.Version, runtime.GOOS, runtime.GOARCH, runtime.Version())
+	return fmt.Sprintf("QShell/%s (%s; %s; %s)", version.Version(), runtime.GOOS, runtime.GOARCH, runtime.Version())
 }

iqshell/common/version/operations/version.go

@@ -21,5 +21,5 @@ func Version(cfg *iqshell.Config, info VersionInfo) {
 		return
 	}
 
-	log.Alert(version.Version)
+	log.Alert(version.Version())
 }

iqshell/common/version/version.go

@@ -1,3 +1,7 @@
 package version
 
-var Version = "UNSTABLE"
+var version = "UNSTABLE"
+
+func Version() string {
+	return version
+}