X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fcrosssdk%2Fsdks.go;h=35a9998e16d56bdf1308f591dc67367288307e84;hb=ea3b17feb2eb2d54bbc27dc75eee60bd1fe67d27;hp=87bb85d704be3c06d4f165e01e0b6ad7ba9b5102;hpb=2c9ae6a5a27ae2f2e23495c613e7a53aed8e786c;p=src%2Fxds%2Fxds-server.git diff --git a/lib/crosssdk/sdks.go b/lib/crosssdk/sdks.go index 87bb85d..35a9998 100644 --- a/lib/crosssdk/sdks.go +++ b/lib/crosssdk/sdks.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/Sirupsen/logrus" - "github.com/iotbzh/xds-server/lib/common" + common "github.com/iotbzh/xds-common/golib" "github.com/iotbzh/xds-server/lib/xdsconfig" ) @@ -39,6 +39,7 @@ func Init(cfg *xdsconfig.Config, log *logrus.Logger) (*SDKs, error) { sdk, err := NewCrossSDK(d) if err != nil { log.Debugf("Error while processing SDK dir=%s, err=%s", d, err.Error()) + continue } s.Sdks = append(s.Sdks, *sdk) } @@ -70,15 +71,15 @@ func (s *SDKs) Get(id int) SDK { } // GetEnvCmd returns the command used to initialized the environment for an SDK -func (s *SDKs) GetEnvCmd(id string, defaultID string) string { +func (s *SDKs) GetEnvCmd(id string, defaultID string) []string { if id == "" && defaultID == "" { // no env cmd - return "" + return []string{} } s.mutex.Lock() defer s.mutex.Unlock() - defaultEnv := "" + defaultEnv := []string{} for _, sdk := range s.Sdks { if sdk.ID == id { return sdk.GetEnvCmd()