From 8f41ac456fc92a9ec333579498e9933d73404905 Mon Sep 17 00:00:00 2001
From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Tue, 20 Jun 2017 22:29:59 +0200
Subject: Remove duplicate fields and set default SDK dir.

- Removed duplicate fields between Config and FileConfig
- set /xdt/sdk as default SDK directory
---
 lib/model/folder.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/model')

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
-- 
cgit 1.2.3-korg