X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsconfig%2Ffileconfig.go;h=bf8aa25c6ab953658c068406e76db03b7ef7b4f7;hb=f1c182ede3c4aed0d6196d05b0a64ff93372e755;hp=8e77de7802f92687fe5fc318f44e48db6dd7fe47;hpb=285332c351777b74abca638b8b2a2cde3c68edc6;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index 8e77de7..bf8aa25 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -51,12 +51,12 @@ type SyncThingConf struct {
 
 // FileConfig is the JSON structure of xds-server config file (server-config.json)
 type FileConfig struct {
-	WebAppDir    string         `json:"webAppDir"`
-	ShareRootDir string         `json:"shareRootDir"`
-	SdkRootDir   string         `json:"sdkRootDir"`
-	HTTPPort     string         `json:"httpPort"`
-	SThgConf     *SyncThingConf `json:"syncthing"`
-	LogsDir      string         `json:"logsDir"`
+	WebAppDir     string         `json:"webAppDir"`
+	ShareRootDir  string         `json:"shareRootDir"`
+	SdkScriptsDir string         `json:"sdkScriptsDir"`
+	HTTPPort      string         `json:"httpPort"`
+	SThgConf      *SyncThingConf `json:"syncthing"`
+	LogsDir       string         `json:"logsDir"`
 }
 
 // readGlobalConfig reads configuration from a config file.
@@ -117,7 +117,7 @@ func readGlobalConfig(c *Config, confFile string) error {
 	vars := []*string{
 		&fCfg.WebAppDir,
 		&fCfg.ShareRootDir,
-		&fCfg.SdkRootDir,
+		&fCfg.SdkScriptsDir,
 		&fCfg.LogsDir}
 	if fCfg.SThgConf != nil {
 		vars = append(vars, &fCfg.SThgConf.Home, &fCfg.SThgConf.BinDir)
@@ -136,8 +136,8 @@ func readGlobalConfig(c *Config, confFile string) error {
 	if fCfg.ShareRootDir == "" {
 		fCfg.ShareRootDir = c.FileConf.ShareRootDir
 	}
-	if fCfg.SdkRootDir == "" {
-		fCfg.SdkRootDir = c.FileConf.SdkRootDir
+	if fCfg.SdkScriptsDir == "" {
+		fCfg.SdkScriptsDir = c.FileConf.SdkScriptsDir
 	}
 	if fCfg.HTTPPort == "" {
 		fCfg.HTTPPort = c.FileConf.HTTPPort