Expand variables on parseValue

Takumasa Sakao · Takumasa Sakao · commit 50c29652a0bb · 2017-11-20T23:20:38.000+09:00
diff --git a/godotenv.go b/godotenv.go
@@ -291,6 +291,13 @@ func parseValue(value string, envMap map[string]string) string {
 		}
 	}
 
+	// expand variables
+	value = os.Expand(value, func(key string) string {
+		if val, ok := envMap[key]; ok {
+			return val
+		}
+		return ""
+	})
 	return value
 }
 

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,13 @@ func parseValue(value string, envMap map[string]string) string {`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
	`294`	`+ // expand variables`
	`295`	`+ value = os.Expand(value, func(key string) string {`
	`296`	`+ if val, ok := envMap[key]; ok {`
	`297`	`+ return val`
	`298`	`+ }`
	`299`	`+ return ""`
	`300`	`+ })`
`294`	`301`	`return value`
`295`	`302`	`}`
`296`	`303`