-// resolveEnvVar Resolved environment variable regarding the syntax ${MYVAR}
-func resolveEnvVar(s string) string {
- re := regexp.MustCompile("\\${(.*)}")
- vars := re.FindAllStringSubmatch(s, -1)
- res := s
- for _, v := range vars {
- val := os.Getenv(v[1])
- if val != "" {
- rer := regexp.MustCompile("\\${" + v[1] + "}")
- res = rer.ReplaceAllString(res, val)
+ // Check first from current directory
+ for _, rootD := range []string{exePath, cwd} {
+ ff := path.Join(rootD, fCfg.WebAppDir, "index.html")
+ if common.Exists(ff) {
+ fCfg.WebAppDir = path.Join(rootD, fCfg.WebAppDir)
+ break
+ }