diff options
| -rw-r--r-- | lib/common/filepath.go | 41 | ||||
| -rw-r--r-- | lib/xdsconfig/fileconfig.go | 25 |
2 files changed, 42 insertions, 24 deletions
diff --git a/lib/common/filepath.go b/lib/common/filepath.go index 603c2a2..42ef82f 100644 --- a/lib/common/filepath.go +++ b/lib/common/filepath.go @@ -1,6 +1,13 @@ package common -import "os" +import ( + "fmt" + "os" + "os/user" + "path" + "path/filepath" + "regexp" +) // Exists returns whether the given file or directory exists or not func Exists(path string) bool { @@ -13,3 +20,35 @@ func Exists(path string) bool { } return true } + +// ResolveEnvVar Resolved environment variable regarding the syntax ${MYVAR} +// or $MYVAR following by a slash or a backslash +func ResolveEnvVar(s string) (string, error) { + + // Resolved tilde : ~/ + if s[:2] == "~/" { + if usr, err := user.Current(); err == nil { + s = filepath.Join(usr.HomeDir, s[2:]) + } + } + + // Resolved ${MYVAR} + re := regexp.MustCompile("\\${([^}]+)}") + vars := re.FindAllStringSubmatch(s, -1) + res := s + for _, v := range vars { + val := os.Getenv(v[1]) + if val == "" { + return res, fmt.Errorf("ERROR: %s env variable not defined", v[1]) + } + + rer := regexp.MustCompile("\\${" + v[1] + "}") + res = rer.ReplaceAllString(res, val) + } + + // Resolved $MYVAR following by a slash (or a backslash for Windows) + // TODO + //re := regexp.MustCompile("\\$([^\\/])+/") + + return path.Clean(res), nil +} diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go index d39cae0..4be54ff 100644 --- a/lib/xdsconfig/fileconfig.go +++ b/lib/xdsconfig/fileconfig.go @@ -2,12 +2,10 @@ package xdsconfig import ( "encoding/json" - "fmt" "os" "os/user" "path" "path/filepath" - "regexp" "strings" "github.com/iotbzh/xds-server/lib/common" @@ -89,11 +87,10 @@ func updateConfigFromFile(c *Config, confFile string) error { &fCfg.SThgConf.Home, &fCfg.SThgConf.BinDir} { - rep, err := resolveEnvVar(*field) - if err != nil { + var err error + if *field, err = common.ResolveEnvVar(*field); err != nil { return err } - *field = path.Clean(rep) } // Config file settings overwrite default config @@ -123,21 +120,3 @@ func updateConfigFromFile(c *Config, confFile string) error { return nil } - -// resolveEnvVar Resolved environment variable regarding the syntax ${MYVAR} -func resolveEnvVar(s string) (string, error) { - re := regexp.MustCompile("\\${(.*)}") - vars := re.FindAllStringSubmatch(s, -1) - res := s - for _, v := range vars { - val := os.Getenv(v[1]) - if val == "" { - return res, fmt.Errorf("ERROR: %s env variable not defined", v[1]) - } - - rer := regexp.MustCompile("\\${" + v[1] + "}") - res = rer.ReplaceAllString(res, val) - } - - return res, nil -} |