Skip to content

Commit

Permalink
Set env var ARDUINO_MODE to "cli" or "daemon"
Browse files Browse the repository at this point in the history
Depending on how the arduino-cli is run, the tools may decide to show a
GUI or print their output on terminal.
  • Loading branch information
cmaglie committed Jan 26, 2022
1 parent aa98caa commit 03577cc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import (
"github.com/arduino/arduino-cli/cli/upload"
"github.com/arduino/arduino-cli/cli/version"
"github.com/arduino/arduino-cli/configuration"
"github.com/arduino/arduino-cli/executils"
"github.com/arduino/arduino-cli/i18n"
"github.com/arduino/arduino-cli/inventory"
"github.com/fatih/color"
Expand Down Expand Up @@ -157,6 +158,9 @@ func parseFormatString(arg string) (feedback.OutputFormat, bool) {
func preRun(cmd *cobra.Command, args []string) {
configFile := configuration.Settings.ConfigFileUsed()

// Initialize env for spawned processes
executils.SetProcessGlobalEnv([]string{"ARDUINO_MODE=cli"})

// initialize inventory
err := inventory.Init(configuration.Settings.GetString("directories.Data"))
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions cli/daemon/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/arduino/arduino-cli/cli/globals"
"github.com/arduino/arduino-cli/commands/daemon"
"github.com/arduino/arduino-cli/configuration"
"github.com/arduino/arduino-cli/executils"
"github.com/arduino/arduino-cli/i18n"
"github.com/arduino/arduino-cli/metrics"
srv_commands "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
Expand Down Expand Up @@ -70,6 +71,8 @@ func NewCommand() *cobra.Command {
func runDaemonCommand(cmd *cobra.Command, args []string) {
logrus.Info("Executing `arduino-cli daemon`")

executils.SetProcessGlobalEnv([]string{"ARDUINO_MODE=daemon"})

if configuration.Settings.GetBool("metrics.enabled") {
metrics.Activate("daemon")
stats.Incr("daemon", stats.T("success", "true"))
Expand Down

0 comments on commit 03577cc

Please sign in to comment.