All environment variables are inserted to CurrentContext variables

Author: kilgaloon

src/client/config.go

@@ -3,6 +3,8 @@ package client
 import (
 	"../log"
 	"gopkg.in/ini.v1"
+	"os"
+	"strings"
 )
 
 // Config values
@@ -27,6 +29,11 @@ func readConfig(path string) *Config {
 	for _, variable := range variables {
 		CurrentContext.DefineVar(variable.Name(), variable.String())
 	}
+	// insert environment variables in our context
+	for _, e := range os.Environ() {
+        pair := strings.Split(e, "=")
+		CurrentContext.DefineVar(pair[0], pair[1])
+	}
 
 	log.Logger.ErrorLog = c.errorLog
 	log.Logger.InfoLog = c.infoLog

src/client/context.go

@@ -42,13 +42,11 @@ func (c *Context) GetVar(name string) Variable {
 
 // Transpile text change variables from context
 func (c *Context) Transpile(toCompile string) string {
-	var str string
-
 	for _, variable := range c.variables {
-		str = strings.Replace(toCompile, "$"+variable.name, variable.value, -1)
+		toCompile = strings.Replace(toCompile, "$"+variable.name, variable.value, -1)
 	}
 
-	return str
+	return toCompile
 }
 
 // CurrentContext of client