summaryrefslogtreecommitdiffstats
path: root/lib/xdsconfig
diff options
context:
space:
mode:
Diffstat (limited to 'lib/xdsconfig')
-rw-r--r--lib/xdsconfig/fileconfig.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index 776eb78..d39cae0 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -23,7 +23,7 @@ type SyncThingConf struct {
type FileConfig struct {
WebAppDir string `json:"webAppDir"`
ShareRootDir string `json:"shareRootDir"`
- SdkRootDir string `json:"sdkRootDir"`
+ SdkRootDir string `json:"sdkRootDir"`
HTTPPort string `json:"httpPort"`
SThgConf *SyncThingConf `json:"syncthing"`
LogsDir string `json:"logsDir"`
@@ -86,7 +86,8 @@ func updateConfigFromFile(c *Config, confFile string) error {
&fCfg.ShareRootDir,
&fCfg.SdkRootDir,
&fCfg.LogsDir,
- &fCfg.SThgConf.Home} {
+ &fCfg.SThgConf.Home,
+ &fCfg.SThgConf.BinDir} {
rep, err := resolveEnvVar(*field)
if err != nil {
@@ -94,7 +95,7 @@ func updateConfigFromFile(c *Config, confFile string) error {
}
*field = path.Clean(rep)
}
-
+
// Config file settings overwrite default config
if fCfg.WebAppDir != "" {