X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxdsconfig%2Fconfig.go;h=74ce21e78ffd2427030181b09e1a9cd86f40f40d;hb=f1c182ede3c4aed0d6196d05b0a64ff93372e755;hp=0201d4054e5dcf544864d205553dd81fb77522c7;hpb=2f7828d01f4c4ca2909f95f098627cd5475ed225;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index 0201d40..74ce21e 100644
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package xdsconfig
 
 import (
@@ -36,9 +53,9 @@ type Options struct {
 const (
 	DefaultAPIVersion = "1"
 	DefaultPort       = "8000"
-	DefaultShareDir   = "${HOME}/.xds-server/projects"
-	DefaultSTHomeDir  = "${HOME}/.xds-server/syncthing-config"
-	DefaultSdkRootDir = "/xdt/sdk"
+	DefaultShareDir   = "${HOME}/.xds/server/projects"
+	DefaultSTHomeDir  = "${HOME}/.xds/server/syncthing-config"
+	DefaultSdkScriptsDir = "${EXEPATH}/scripts/sdks"
 )
 
 // Init loads the configuration on start-up
@@ -54,6 +71,7 @@ func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
 		dfltSTHomeDir = resDir
 	}
 
+	// Retrieve Server ID (or create one the first time)
 	uuid, err := ServerIDGet()
 	if err != nil {
 		return nil, err
@@ -79,7 +97,7 @@ func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
 		FileConf: FileConfig{
 			WebAppDir:    "webapp/dist",
 			ShareRootDir: dfltShareDir,
-			SdkRootDir:   DefaultSdkRootDir,
+			SdkScriptsDir: DefaultSdkScriptsDir,
 			HTTPPort:     DefaultPort,
 			SThgConf:     &SyncThingConf{Home: dfltSTHomeDir},
 			LogsDir:      "",