Config search now looks into ARDUINO_DIRECTORIES_DATA env too

cmaglie · cmaglie · commit 2a26a8e167e0 · 2024-04-21T18:04:59.000+02:00
diff --git a/internal/cli/configuration/configuration.go b/internal/cli/configuration/configuration.go
@@ -109,5 +109,11 @@ func FindConfigFileInArgsFallbackOnEnv(args []string) string {
 	if p, ok := os.LookupEnv("ARDUINO_CONFIG_FILE"); ok {
 		return p
 	}
+	if p, ok := os.LookupEnv("ARDUINO_DIRECTORIES_DATA"); ok {
+		return filepath.Join(p, "arduino-cli.yaml")
+	}
+	if p, ok := os.LookupEnv("ARDUINO_DATA_DIR"); ok {
+		return filepath.Join(p, "arduino-cli.yaml")
+	}
 	return filepath.Join(getDefaultArduinoDataDir(), "arduino-cli.yaml")
 }

Original file line number	Diff line number	Diff line change
`@@ -109,5 +109,11 @@ func FindConfigFileInArgsFallbackOnEnv(args []string) string {`
`109`	`109`	`if p, ok := os.LookupEnv("ARDUINO_CONFIG_FILE"); ok {`
`110`	`110`	`return p`
`111`	`111`	`}`
	`112`	`+ if p, ok := os.LookupEnv("ARDUINO_DIRECTORIES_DATA"); ok {`
	`113`	`+ return filepath.Join(p, "arduino-cli.yaml")`
	`114`	`+ }`
	`115`	`+ if p, ok := os.LookupEnv("ARDUINO_DATA_DIR"); ok {`
	`116`	`+ return filepath.Join(p, "arduino-cli.yaml")`
	`117`	`+ }`
`112`	`118`	`return filepath.Join(getDefaultArduinoDataDir(), "arduino-cli.yaml")`
`113`	`119`	`}`