Simplified os-env management

Author: cmaglie

internal/libraries/clamav.go

@@ -30,34 +30,10 @@ import (
 	"strings"
 )
 
-func envSliceToMap(env []string) map[string]string {
-	envMap := make(map[string]string)
-	for _, value := range env {
-		key := value[:strings.Index(value, "=")]
-		value = value[strings.Index(value, "=")+1:]
-		envMap[key] = value
-	}
-	return envMap
-}
-
-func envMapToSlice(envMap map[string]string) []string {
-	var env []string
-	for key, value := range envMap {
-		env = append(env, key+"="+value)
-	}
-	return env
-}
-
-func modifyEnv(env []string, key, value string) []string {
-	envMap := envSliceToMap(env)
-	envMap[key] = value
-	return envMapToSlice(envMap)
-}
-
 // RunAntiVirus scans the folder for viruses.
 func RunAntiVirus(folder string) ([]byte, error) {
 	cmd := exec.Command("clamdscan", "--fdpass", "-i", folder)
-	cmd.Env = modifyEnv(os.Environ(), "LANG", "en")
+	cmd.Env = append(os.Environ(), "LANG=en")
 
 	out, err := cmd.CombinedOutput()
 	if err != nil {

internal/libraries/lint.go

@@ -72,8 +72,9 @@ func RunArduinoLint(arduinoLintPath string, folder string, metadata *Repo) ([]by
 		folder,
 	)
 	// See: https://arduino.github.io/arduino-lint/latest/#environment-variables
-	cmd.Env = modifyEnv(os.Environ(), "ARDUINO_LINT_LIBRARY_MANAGER_INDEXING", "true")
-	cmd.Env = modifyEnv(cmd.Env, "ARDUINO_LINT_OFFICIAL", fmt.Sprintf("%t", official(metadata)))
+	cmd.Env = append(os.Environ(),
+		"ARDUINO_LINT_LIBRARY_MANAGER_INDEXING=true",
+		fmt.Sprintf("ARDUINO_LINT_OFFICIAL=%t", official(metadata)))
 
 	textReport, lintErr := cmd.CombinedOutput()
 	if lintErr != nil {