Merge pull request #29 from joho/respect_empty_external_env_vars

Respect preset empty external env vars
joho · Mar 28, 2017 · 325433c · 325433c
2 parents eaf676f + 034acc2
commit 325433c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/godotenv.go b/godotenv.go
@@ -119,8 +119,15 @@ func loadFile(filename string, overload bool) error {
 		return err
 	}
 
+	currentEnv := map[string]bool{}
+	rawEnv := os.Environ()
+	for _, rawEnvLine := range rawEnv {
+		key := strings.Split(rawEnvLine, "=")[0]
+		currentEnv[key] = true
+	}
+
 	for key, value := range envMap {
-		if os.Getenv(key) == "" || overload {
+		if !currentEnv[key] || overload {
 			os.Setenv(key, value)
 		}
 	}

diff --git a/godotenv_test.go b/godotenv_test.go
@@ -100,10 +100,12 @@ func TestLoadDoesNotOverride(t *testing.T) {
 	// ensure NO overload
 	presets := map[string]string{
 		"OPTION_A": "do_not_override",
+		"OPTION_B": "",
 	}
 
 	expectedValues := map[string]string{
 		"OPTION_A": "do_not_override",
+		"OPTION_B": "",
 	}
 	loadEnvAndCompareValues(t, Load, envFileName, expectedValues, presets)
 }