Fixed missing ARDUINO_USER_AGENT env var

arduino · Jan 15, 2024 · 94b5c50 · 94b5c50
1 parent 4db66a8
commit 94b5c50
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -199,6 +199,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 		paths.NewPathList(req.GetLibrary()...),
 		outStream, errStream, req.GetVerbose(), req.GetWarnings(),
 		progressCB,
+		pme.GetEnvVarsForSpawnedProcess(),
 	)
 	if err != nil {
 		if strings.Contains(err.Error(), "invalid build properties") {

diff --git a/internal/arduino/builder/builder.go b/internal/arduino/builder/builder.go
@@ -92,6 +92,8 @@ type Builder struct {
 
 	libsDetector *detector.SketchLibrariesDetector
 
+	toolEnv []string
+
 	// This is a function used to parse the output of the compiler
 	// It is used to extract errors and warnings
 	compilerOutputParser diagnostics.CompilerOutputParserCB
@@ -133,6 +135,7 @@ func NewBuilder(
 	libraryDirs paths.PathList,
 	stdout, stderr io.Writer, verbose bool, warningsLevel string,
 	progresCB rpc.TaskProgressCB,
+	toolEnv []string,
 ) (*Builder, error) {
 	buildProperties := properties.NewMap()
 	if boardBuildProperties != nil {
@@ -216,6 +219,7 @@ func NewBuilder(
 		buildArtifacts:                &buildArtifacts{},
 		targetPlatform:                targetPlatform,
 		actualPlatform:                actualPlatform,
+		toolEnv:                       toolEnv,
 		libsDetector: detector.NewSketchLibrariesDetector(
 			libsManager, libsResolver,
 			useCachedLibrariesResolution,
@@ -521,7 +525,7 @@ func (b *Builder) prepareCommandForRecipe(buildProperties *properties.Map, recip
 		}
 	}
 
-	command, err := paths.NewProcess(nil, parts...)
+	command, err := paths.NewProcess(b.toolEnv, parts...)
 	if err != nil {
 		return nil, err
 	}