summaryrefslogtreecommitdiffstats
path: root/lib/xdsconfig/fileconfig.go
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-06-20 22:29:59 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-06-20 22:29:59 +0200
commit8f41ac456fc92a9ec333579498e9933d73404905 (patch)
tree6be8211c41c7ff19a6b23bd1d1d289a39bd6373e /lib/xdsconfig/fileconfig.go
parentdd62e1e5ec325c77164c578d11ba4c0e118307d9 (diff)
Remove duplicate fields and set default SDK dir.
- Removed duplicate fields between Config and FileConfig - set /xdt/sdk as default SDK directory
Diffstat (limited to 'lib/xdsconfig/fileconfig.go')
-rw-r--r--lib/xdsconfig/fileconfig.go36
1 files changed, 19 insertions, 17 deletions
diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index 01bd4c9..99e5382 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -77,7 +77,6 @@ func updateConfigFromFile(c *Config, confFile string) error {
if err := json.NewDecoder(fd).Decode(&fCfg); err != nil {
return err
}
- c.FileConf = fCfg
// Support environment variables (IOW ${MY_ENV_VAR} syntax) in config.json
for _, field := range []*string{
@@ -94,30 +93,33 @@ func updateConfigFromFile(c *Config, confFile string) error {
}
}
- // Config file settings overwrite default config
-
- if fCfg.WebAppDir != "" {
- c.WebAppDir = strings.Trim(fCfg.WebAppDir, " ")
+ // Use config file settings else use default config
+ if fCfg.WebAppDir == "" {
+ fCfg.WebAppDir = c.FileConf.WebAppDir
+ }
+ if fCfg.ShareRootDir == "" {
+ fCfg.ShareRootDir = c.FileConf.ShareRootDir
}
- // Is it a full path ?
- if !strings.HasPrefix(c.WebAppDir, "/") && exePath != "" {
+ if fCfg.SdkRootDir == "" {
+ fCfg.SdkRootDir = c.FileConf.SdkRootDir
+ }
+ if fCfg.HTTPPort == "" {
+ fCfg.HTTPPort = c.FileConf.HTTPPort
+ }
+
+ // Resolve webapp dir (support relative or full path)
+ fCfg.WebAppDir = strings.Trim(fCfg.WebAppDir, " ")
+ if !strings.HasPrefix(fCfg.WebAppDir, "/") && exePath != "" {
// Check first from current directory
for _, rootD := range []string{cwd, exePath} {
- ff := path.Join(rootD, c.WebAppDir, "index.html")
+ ff := path.Join(rootD, fCfg.WebAppDir, "index.html")
if common.Exists(ff) {
- c.WebAppDir = path.Join(rootD, c.WebAppDir)
+ fCfg.WebAppDir = path.Join(rootD, fCfg.WebAppDir)
break
}
}
}
- if fCfg.ShareRootDir != "" {
- c.ShareRootDir = fCfg.ShareRootDir
- }
-
- if fCfg.HTTPPort != "" {
- c.HTTPPort = fCfg.HTTPPort
- }
-
+ c.FileConf = fCfg
return nil
}