Commit 8774c907 authored by Michael Banzon's avatar Michael Banzon

Removed the Windows part. It wasn't working properly.

For issue #304.
parent 01465932
...@@ -9,8 +9,7 @@ import ( ...@@ -9,8 +9,7 @@ import (
) )
var ( var (
unixEnvRegEx = regexp.MustCompile("{\\$[^}]+}") envRegEx = regexp.MustCompile("{\\$[^}]+}")
windowsEnvRegEx = regexp.MustCompile("{%[^}]+%}")
) )
type parser struct { type parser struct {
...@@ -338,18 +337,11 @@ func (sb serverBlock) HostList() []string { ...@@ -338,18 +337,11 @@ func (sb serverBlock) HostList() []string {
} }
func getValFromEnv(s string) string { func getValFromEnv(s string) string {
envRefsUnix := unixEnvRegEx.FindAllString(s, -1) envRefs := envRegEx.FindAllString(s, -1)
for _, ref := range envRefsUnix { for _, ref := range envRefs {
s = strings.Replace(s, ref, os.Getenv(ref[2:len(ref)-1]), -1) s = strings.Replace(s, ref, os.Getenv(ref[2:len(ref)-1]), -1)
} }
envRefsWin := unixEnvRegEx.FindAllString(s, -1)
for _, ref := range envRefsWin {
s = strings.Replace(s, ref, os.Getenv(ref[2:len(ref)-2]), -1)
}
return s return s
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment