Skip to content

Commit 59820e9

Browse files
author
Roberto Sora
committed
replaced cli.Version var with global getter
1 parent a7fe054 commit 59820e9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

cli/root/root.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package root
1919

2020
import (
2121
"fmt"
22-
"github.com/arduino/arduino-cli/global"
2322
"io/ioutil"
2423
"os"
2524

@@ -36,6 +35,7 @@ import (
3635
"github.com/arduino/arduino-cli/commands/generatedocs"
3736
"github.com/arduino/arduino-cli/common/formatter"
3837
"github.com/arduino/arduino-cli/configs"
38+
"github.com/arduino/arduino-cli/global"
3939
paths "github.com/arduino/go-paths-helper"
4040
colorable "github.com/mattn/go-colorable"
4141
"github.com/sirupsen/logrus"
@@ -92,7 +92,7 @@ func preRun(cmd *cobra.Command, args []string) {
9292
}
9393
initConfigs()
9494

95-
logrus.Info(global.GetAppName() + "-" + cli.Version)
95+
logrus.Info(global.GetAppName() + "-" + global.GetVersion())
9696
logrus.Info("Starting root command preparation (`arduino`)")
9797
switch outputFormat {
9898
case "text":

cli/version/version.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package version
1919

2020
import (
2121
"fmt"
22-
"github.com/arduino/arduino-cli/global"
2322

2423
"github.com/arduino/arduino-cli/cli"
24+
"github.com/arduino/arduino-cli/global"
2525
"github.com/spf13/cobra"
2626
)
2727

@@ -46,7 +46,7 @@ type versionOutput struct {
4646
func run(cmd *cobra.Command, args []string) {
4747
res := &versionOutput{
4848
Command: cmd.Parent().Name(),
49-
Version: cli.Version,
49+
Version: global.GetVersion(),
5050
}
5151
if cli.OutputJSONOrElse(res) {
5252
fmt.Printf("%s version %s\n", res.Command, res.Version)

daemon/daemon.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
"log"
2727
"net"
2828

29-
"github.com/arduino/arduino-cli/cli"
3029
"github.com/arduino/arduino-cli/commands"
3130
"github.com/arduino/arduino-cli/commands/board"
3231
"github.com/arduino/arduino-cli/commands/compile"
3332
"github.com/arduino/arduino-cli/commands/core"
3433
"github.com/arduino/arduino-cli/commands/lib"
3534
"github.com/arduino/arduino-cli/commands/upload"
35+
"github.com/arduino/arduino-cli/global"
3636
"github.com/arduino/arduino-cli/rpc"
3737
"github.com/spf13/cobra"
3838
"google.golang.org/grpc"
@@ -121,7 +121,7 @@ func (s *ArduinoCoreServerImpl) Init(req *rpc.InitReq, stream rpc.ArduinoCore_In
121121
}
122122

123123
func (s *ArduinoCoreServerImpl) Version(ctx context.Context, req *rpc.VersionReq) (*rpc.VersionResp, error) {
124-
return &rpc.VersionResp{Version: cli.Version}, nil
124+
return &rpc.VersionResp{Version: global.GetVersion()}, nil
125125
}
126126

127127
func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileReq, stream rpc.ArduinoCore_CompileServer) error {

0 commit comments

Comments
 (0)