From 7bdbba2e53827f6ca5974a083104c5feb60ff3db Mon Sep 17 00:00:00 2001
From: David Dollar <ddollar@gmail.com>
Date: Tue, 3 Sep 2013 22:01:05 -0400
Subject: [PATCH] switch to gotenv

---
 env.go | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/env.go b/env.go
index 45735ca..41fe82e 100644
--- a/env.go
+++ b/env.go
@@ -1,9 +1,7 @@
 package main
 
 import (
-	"bufio"
-	"fmt"
-	"io"
+	"github.com/subosito/gotenv"
 	"os"
 	"regexp"
 )
@@ -26,20 +24,9 @@ func ReadEnv(filename string) (Env, error) {
 		return nil, err
 	}
 	defer fd.Close()
-	return parseEnv(fd)
-}
-
-func parseEnv(r io.Reader) (Env, error) {
 	env := make(Env)
-	scanner := bufio.NewScanner(r)
-	for scanner.Scan() {
-		parts := envEntryRegexp.FindStringSubmatch(scanner.Text())
-		if len(parts) == 3 {
-			env[parts[1]] = parts[2]
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("Reading Env: %s", err)
+	for key, val := range gotenv.Parse(fd) {
+		env[key] = val
 	}
 	return env, nil
 }