Skip to content

Commit 03577cc

Browse files
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 03577cc

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

cli/cli.go

+4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import (
4545
"github.com/arduino/arduino-cli/cli/upload"
4646
"github.com/arduino/arduino-cli/cli/version"
4747
"github.com/arduino/arduino-cli/configuration"
48+
"github.com/arduino/arduino-cli/executils"
4849
"github.com/arduino/arduino-cli/i18n"
4950
"github.com/arduino/arduino-cli/inventory"
5051
"github.com/fatih/color"
@@ -157,6 +158,9 @@ func parseFormatString(arg string) (feedback.OutputFormat, bool) {
157158
func preRun(cmd *cobra.Command, args []string) {
158159
configFile := configuration.Settings.ConfigFileUsed()
159160

161+
// Initialize env for spawned processes
162+
executils.SetProcessGlobalEnv([]string{"ARDUINO_MODE=cli"})
163+
160164
// initialize inventory
161165
err := inventory.Init(configuration.Settings.GetString("directories.Data"))
162166
if err != nil {

cli/daemon/daemon.go

+3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"github.com/arduino/arduino-cli/cli/globals"
3131
"github.com/arduino/arduino-cli/commands/daemon"
3232
"github.com/arduino/arduino-cli/configuration"
33+
"github.com/arduino/arduino-cli/executils"
3334
"github.com/arduino/arduino-cli/i18n"
3435
"github.com/arduino/arduino-cli/metrics"
3536
srv_commands "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
@@ -70,6 +71,8 @@ func NewCommand() *cobra.Command {
7071
func runDaemonCommand(cmd *cobra.Command, args []string) {
7172
logrus.Info("Executing `arduino-cli daemon`")
7273

74+
executils.SetProcessGlobalEnv([]string{"ARDUINO_MODE=daemon"})
75+
7376
if configuration.Settings.GetBool("metrics.enabled") {
7477
metrics.Activate("daemon")
7578
stats.Incr("daemon", stats.T("success", "true"))

0 commit comments

Comments
 (0)