Add env file quotes handling

photra · photra · commit 3efdec632875 · 2022-06-06T12:57:22.000+07:00
Signed-off-by: Phong Tran &lt;tran.pho@northeastern.edu&gt;
diff --git a/opts/envfile_test.go b/opts/envfile_test.go
@@ -35,6 +35,8 @@ func TestParseEnvFileGoodFile(t *testing.T) {
 _foobar=foobaz
 with.dots=working
 and_underscore=working too
+single_quotes='quotes working'
+double_quotes="quotes working"
 `
 	// Adding a newline + a line with pure whitespace.
 	// This is being done like this instead of the block above
@@ -55,6 +57,8 @@ and_underscore=working too
 		"_foobar=foobaz",
 		"with.dots=working",
 		"and_underscore=working too",
+		"single_quotes=quotes working",
+		"double_quotes=quotes working",
 	}
 
 	if !reflect.DeepEqual(lines, expectedLines) {
diff --git a/opts/file.go b/opts/file.go
@@ -10,7 +10,10 @@ import (
 	"unicode/utf8"
 )
 
-const whiteSpaces = " \t"
+const (
+	whiteSpaces = " \t"
+	quotes      = "'\""
+)
 
 // ErrBadKey typed error for bad environment variable
 type ErrBadKey struct {
@@ -58,8 +61,12 @@ func parseKeyValueFile(filename string, emptyFn func(string) (string, bool)) ([]
 			}
 
 			if len(data) > 1 {
-				// pass the value through, no trimming
-				lines = append(lines, fmt.Sprintf("%s=%s", variable, data[1]))
+				// pass the value through, trimming leading and trailing quotes
+				value := data[1]
+				value = strings.TrimLeft(value, quotes)
+				value = strings.TrimRight(value, quotes)
+
+				lines = append(lines, fmt.Sprintf("%s=%s", variable, value))
 			} else {
 				var value string
 				var present bool
