summaryrefslogtreecommitdiffstats
path: root/lib/model
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/model
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/model')
-rw-r--r--lib/model/folder.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/model/folder.go b/lib/model/folder.go
index fa94409..c73accc 100644
--- a/lib/model/folder.go
+++ b/lib/model/folder.go
@@ -48,7 +48,7 @@ func (c *Folder) UpdateAll(newCfg xdsconfig.Config) error {
Label: f.Label,
RelativePath: f.RelativePath,
SyncThingID: f.SyncThingID,
- ShareRootDir: c.ShareRootDir,
+ ShareRootDir: c.FileConf.ShareRootDir,
}); err != nil {
return err
}
@@ -62,7 +62,7 @@ func (c *Folder) UpdateAll(newCfg xdsconfig.Config) error {
func (c *Folder) UpdateFolder(newFolder xdsconfig.FolderConfig) (xdsconfig.FolderConfig, error) {
// rootPath should not be empty
if newFolder.RootPath == "" {
- newFolder.RootPath = c.Conf.ShareRootDir
+ newFolder.RootPath = c.Conf.FileConf.ShareRootDir
}
// Sanity check of folder settings