replace cli.AppName with global variable global.GetAppName() getter

Author: Roberto Sora

cli/arduino-cli.yaml

@@ -0,0 +1,2 @@
+board_manager:
+  additional_urls:

cli/board/attach.go

@@ -19,6 +19,7 @@ package board
 
 import (
 	"context"
+	"github.com/arduino/arduino-cli/global"
 	"os"
 
 	"github.com/arduino/arduino-cli/cli"
@@ -33,9 +34,9 @@ func initAttachCommand() *cobra.Command {
 		Use:   "attach <port>|<FQBN> [sketchPath]",
 		Short: "Attaches a sketch to a board.",
 		Long:  "Attaches a sketch to a board.",
-		Example: "  " + cli.AppName + " board attach serial:///dev/tty/ACM0\n" +
-			"  " + cli.AppName + " board attach serial:///dev/tty/ACM0 HelloWorld\n" +
-			"  " + cli.AppName + " board attach arduino:samd:mkr1000",
+		Example: "  " + global.GetAppName() + " board attach serial:///dev/tty/ACM0\n" +
+			"  " + global.GetAppName() + " board attach serial:///dev/tty/ACM0 HelloWorld\n" +
+			"  " + global.GetAppName() + " board attach arduino:samd:mkr1000",
 		Args: cobra.RangeArgs(1, 2),
 		Run:  runAttachCommand,
 	}

cli/board/board.go

@@ -18,7 +18,7 @@
 package board
 
 import (
-	"github.com/arduino/arduino-cli/cli"
+	"github.com/arduino/arduino-cli/global"
 	"github.com/spf13/cobra"
 )
 
@@ -29,9 +29,9 @@ func InitCommand() *cobra.Command {
 		Short: "Arduino board commands.",
 		Long:  "Arduino board commands.",
 		Example: "  # Lists all connected boards.\n" +
-			"  " + cli.AppName + " board list\n\n" +
+			"  " + global.GetAppName() + " board list\n\n" +
 			"  # Attaches a sketch to a board.\n" +
-			"  " + cli.AppName + " board attach serial:///dev/tty/ACM0 mySketch",
+			"  " + global.GetAppName() + " board attach serial:///dev/tty/ACM0 mySketch",
 	}
 	boardCommand.AddCommand(initAttachCommand())
 	boardCommand.AddCommand(initDetailsCommand())

cli/board/details.go

@@ -20,6 +20,7 @@ package board
 import (
 	"context"
 	"fmt"
+	"github.com/arduino/arduino-cli/global"
 	"os"
 
 	"github.com/arduino/arduino-cli/cli"
@@ -35,7 +36,7 @@ func initDetailsCommand() *cobra.Command {
 		Use:     "details <FQBN>",
 		Short:   "Print details about a board.",
 		Long:    "Show information about a board, in particular if the board has options to be specified in the FQBN.",
-		Example: "  " + cli.AppName + " board details arduino:avr:nano",
+		Example: "  " + global.GetAppName() + " board details arduino:avr:nano",
 		Args:    cobra.ExactArgs(1),
 		Run:     runDetailsCommand,
 	}

cli/board/list.go

@@ -20,6 +20,7 @@ package board
 import (
 	"context"
 	"fmt"
+	"github.com/arduino/arduino-cli/global"
 	"os"
 	"sort"
 	"time"
@@ -37,7 +38,7 @@ func initListCommand() *cobra.Command {
 		Use:     "list",
 		Short:   "List connected boards.",
 		Long:    "Detects and displays a list of connected boards to the current computer.",
-		Example: "  " + cli.AppName + " board list --timeout 10s",
+		Example: "  " + global.GetAppName() + " board list --timeout 10s",
 		Args:    cobra.NoArgs,
 		Run:     runListCommand,
 	}

cli/board/listall.go

@@ -20,6 +20,7 @@ package board
 import (
 	"context"
 	"fmt"
+	"github.com/arduino/arduino-cli/global"
 	"os"
 	"sort"
 
@@ -39,8 +40,8 @@ func initListAllCommand() *cobra.Command {
 			"List all boards that have the support platform installed. You can search\n" +
 			"for a specific board if you specify the board name",
 		Example: "" +
-			"  " + cli.AppName + " board listall\n" +
-			"  " + cli.AppName + " board listall zero",
+			"  " + global.GetAppName() + " board listall\n" +
+			"  " + global.GetAppName() + " board listall zero",
 		Args: cobra.ArbitraryArgs,
 		Run:  runListAllCommand,
 	}

cli/cli.go

@@ -20,17 +20,16 @@ package cli
 import (
 	"context"
 	"errors"
-	"os"
-	"path/filepath"
-
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/configs"
+	"github.com/arduino/arduino-cli/global"
 	"github.com/arduino/arduino-cli/rpc"
-	paths "github.com/arduino/go-paths-helper"
+	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
+	"os"
 )
 
 // Error codes to be used for os.Exit().
@@ -61,9 +60,6 @@ var GlobalFlags struct {
 	OutputJSON bool // true output in JSON, false output as Text
 }
 
-// AppName is the command line name of the Arduino CLI executable
-var AppName = filepath.Base(os.Args[0])
-
 var Config *configs.Configuration
 
 func packageManagerInitReq() *rpc.InitReq {
@@ -116,7 +112,7 @@ func CreateInstance() *rpc.Instance {
 		for _, err := range resp.GetPlatformsIndexErrors() {
 			formatter.PrintError(errors.New(err), "Error loading index")
 		}
-		formatter.PrintErrorMessage("Launch '" + AppName + " core update-index' to fix or download indexes.")
+		formatter.PrintErrorMessage("Launch '" + global.GetAppName() + " core update-index' to fix or download indexes.")
 		os.Exit(ErrGeneric)
 	}
 	return resp.GetInstance()

cli/compile/compile.go

@@ -19,6 +19,7 @@ package compile
 
 import (
 	"context"
+	"github.com/arduino/arduino-cli/global"
 	"os"
 
 	"github.com/arduino/arduino-cli/cli"
@@ -35,7 +36,7 @@ func InitCommand() *cobra.Command {
 		Use:     "compile",
 		Short:   "Compiles Arduino sketches.",
 		Long:    "Compiles Arduino sketches.",
-		Example: "  " + cli.AppName + " compile -b arduino:avr:uno /home/user/Arduino/MySketch",
+		Example: "  " + global.GetAppName() + " compile -b arduino:avr:uno /home/user/Arduino/MySketch",
 		Args:    cobra.MaximumNArgs(1),
 		Run:     run,
 	}

cli/config/config.go

@@ -18,7 +18,7 @@
 package config
 
 import (
-	"github.com/arduino/arduino-cli/cli"
+	"github.com/arduino/arduino-cli/global"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +27,7 @@ func InitCommand() *cobra.Command {
 	configCommand := &cobra.Command{
 		Use:     "config",
 		Short:   "Arduino Configuration Commands.",
-		Example: "  " + cli.AppName + " config init",
+		Example: "  " + global.GetAppName() + " config init",
 	}
 	configCommand.AddCommand(initDumpCommand())
 	configCommand.AddCommand(initInitCommand())

cli/config/dump.go

@@ -19,6 +19,7 @@ package config
 
 import (
 	"fmt"
+	"github.com/arduino/arduino-cli/global"
 	"os"
 
 	"github.com/arduino/arduino-cli/cli"
@@ -32,7 +33,7 @@ func initDumpCommand() *cobra.Command {
 		Use:     "dump",
 		Short:   "Prints the current configuration",
 		Long:    "Prints the current configuration.",
-		Example: "  " + cli.AppName + " config dump",
+		Example: "  " + global.GetAppName() + " config dump",
 		Args:    cobra.NoArgs,
 		Run:     runDumpCommand,
 	}