From 51da3506a296b7d5d4185b17364f188292136888 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Wed, 17 May 2017 16:08:03 +0200 Subject: Use autogenerated Synchting apikey. Except if gui-apikey is set in config.json file. Signed-off-by: Sebastien Douheret --- lib/xdsconfig/fileconfig.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/xdsconfig/fileconfig.go') 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 != "" { -- cgit 1.2.3-korg