Commit 03577cc

committed

Set env var ARDUINO_MODE to "cli" or "daemon"

Depending on how the arduino-cli is run, the tools may decide to show a GUI or print their output on terminal.

1 parent aa98caa commit 03577ccCopy full SHA for 03577cc

File tree

-0

lines changed

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ import (`
`45`	`45`	`"github.com/arduino/arduino-cli/cli/upload"`
`46`	`46`	`"github.com/arduino/arduino-cli/cli/version"`
`47`	`47`	`"github.com/arduino/arduino-cli/configuration"`
	`48`	`+ "github.com/arduino/arduino-cli/executils"`
`48`	`49`	`"github.com/arduino/arduino-cli/i18n"`
`49`	`50`	`"github.com/arduino/arduino-cli/inventory"`
`50`	`51`	`"github.com/fatih/color"`
`@@ -157,6 +158,9 @@ func parseFormatString(arg string) (feedback.OutputFormat, bool) {`
`157`	`158`	`func preRun(cmd *cobra.Command, args []string) {`
`158`	`159`	`configFile := configuration.Settings.ConfigFileUsed()`
`159`	`160`
	`161`	`+ // Initialize env for spawned processes`
	`162`	`+ executils.SetProcessGlobalEnv([]string{"ARDUINO_MODE=cli"})`
	`163`	`+`
`160`	`164`	`// initialize inventory`
`161`	`165`	`err := inventory.Init(configuration.Settings.GetString("directories.Data"))`
`162`	`166`	`if err != nil {`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ import (`
`30`	`30`	`"github.com/arduino/arduino-cli/cli/globals"`
`31`	`31`	`"github.com/arduino/arduino-cli/commands/daemon"`
`32`	`32`	`"github.com/arduino/arduino-cli/configuration"`
	`33`	`+ "github.com/arduino/arduino-cli/executils"`
`33`	`34`	`"github.com/arduino/arduino-cli/i18n"`
`34`	`35`	`"github.com/arduino/arduino-cli/metrics"`
`35`	`36`	`srv_commands "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"`
`@@ -70,6 +71,8 @@ func NewCommand() *cobra.Command {`
`70`	`71`	`func runDaemonCommand(cmd *cobra.Command, args []string) {`
`71`	`72`	logrus.Info("Executing `arduino-cli daemon`")
`72`	`73`
	`74`	`+ executils.SetProcessGlobalEnv([]string{"ARDUINO_MODE=daemon"})`
	`75`	`+`
`73`	`76`	`if configuration.Settings.GetBool("metrics.enabled") {`
`74`	`77`	`metrics.Activate("daemon")`
`75`	`78`	`stats.Incr("daemon", stats.T("success", "true"))`

Comments

(0)