toolshed/godotenv
1
0
Fork 0
forked from coop-cloud-mirrors/godotenv
Code Issues Pull Requests Activity

Pass envMap to parseLine & parseValue

Browse Source
This commit is contained in:
Takumasa Sakao
2017-11-20 22:21:39 +09:00
parent 6d367c18ed
commit 9be76b3741
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
godotenv.go
View File

@ -112,7 +112,7 @@ func Parse(r io.Reader) (envMap map[string]string, err error) {
for _, fullLine := range lines {
if !isIgnoredLine(fullLine) {
var key, value string
key, value, err = parseLine(fullLine)
key, value, err = parseLine(fullLine, envMap)
if err != nil {
return
@ -209,7 +209,7 @@ func readFile(filename string) (envMap map[string]string, err error) {
return Parse(file)
}
func parseLine(line string) (key string, value string, err error) {
func parseLine(line string, envMap map[string]string) (key string, value string, err error) {
if len(line) == 0 {
err = errors.New("zero length string")
return
@ -259,11 +259,11 @@ func parseLine(line string) (key string, value string, err error) {
key = strings.Trim(key, " ")
// Parse the value
value = parseValue(splitString[1])
value = parseValue(splitString[1], envMap)
return
}
func parseValue(value string) string {
func parseValue(value string, envMap map[string]string) string {
// trim
value = strings.Trim(value, " ")