X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmd-sdks.go;h=35b053e90bae7a0dc05a7cc8c740631014f10e53;hb=5e7b2dec616b844dd881897727d0edceb90dfa85;hp=3fc596ffd111ac8bd533cbc38dcb8f0722b0c38e;hpb=5ce05ccae810f532e73350a205b979faf2603235;p=src%2Fxds%2Fxds-cli.git

diff --git a/cmd-sdks.go b/cmd-sdks.go
index 3fc596f..35b053e 100644
--- a/cmd-sdks.go
+++ b/cmd-sdks.go
@@ -142,7 +142,7 @@ func sdksList(ctx *cli.Context) error {
 }
 
 func sdksGet(ctx *cli.Context) error {
-	id := GetID(ctx)
+	id := GetID(ctx, "XDS_SDK_ID")
 	if id == "" {
 		return cli.NewExitError("id parameter or option must be set", 1)
 	}
@@ -226,7 +226,7 @@ func _sdksListGet(sdks *[]xaapiv1.SDK) error {
 }
 
 func sdksInstall(ctx *cli.Context) error {
-	id := GetID(ctx)
+	id := GetID(ctx, "XDS_SDK_ID")
 	file := ctx.String("file")
 	force := ctx.Bool("force")
 	shortOut := ctx.Bool("short")
@@ -242,7 +242,7 @@ func sdksInstall(ctx *cli.Context) error {
 	}
 	exitChan := make(chan exitResult, 1)
 
-	IOsk.On("disconnection", func(err error) {
+	IOSkClient.On("disconnection", func(err error) {
 		Log.Debugf("WS disconnection event with err: %v\n", err)
 		errMsg := ""
 		if err != nil {
@@ -251,7 +251,7 @@ func sdksInstall(ctx *cli.Context) error {
 		exitChan <- exitResult{errMsg, 2}
 	})
 
-	IOsk.On(xaapiv1.EVTSDKManagement, func(ev xaapiv1.EventMsg) {
+	IOSkClient.On(xaapiv1.EVTSDKManagement, func(ev xaapiv1.EventMsg) {
 		sdkEvt, _ := ev.DecodeSDKMgtMsg()
 
 		if sdkEvt.Action != xaapiv1.SdkMgtActionInstall {
@@ -259,11 +259,11 @@ func sdksInstall(ctx *cli.Context) error {
 			return
 		}
 
-		if !shortOut && sdkEvt.Stdout != "" {
-			fmt.Printf("%s", sdkEvt.Stdout)
+		if !shortOut && len(sdkEvt.Stdout) > 0 {
+			os.Stdout.Write([]byte(sdkEvt.Stdout))
 		}
-		if !shortOut && sdkEvt.Stderr != "" {
-			fmt.Fprintf(os.Stderr, "%s", sdkEvt.Stderr)
+		if !shortOut && len(sdkEvt.Stderr) > 0 {
+			os.Stderr.Write([]byte(sdkEvt.Stderr))
 		}
 
 		if sdkEvt.Exited {
@@ -271,7 +271,7 @@ func sdksInstall(ctx *cli.Context) error {
 		}
 	})
 
-	IOsk.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
+	IOSkClient.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
 		sdk, _ := ev.DecodeSDKEvent()
 		Log.Debugf("EVTSDKStateChange: %v", sdk)
 	})
@@ -305,6 +305,10 @@ func sdksInstall(ctx *cli.Context) error {
 
 	// Wait exit
 	select {
+	case res := <-IOSkClient.ServerDiscoChan:
+		Log.Debugf("XDS Server disconnected %v", res)
+		return cli.NewExitError(res.error, res.code)
+
 	case res := <-exitChan:
 		if res.code == 0 {
 			Log.Debugln("Exit successfully")
@@ -322,7 +326,7 @@ func sdksInstall(ctx *cli.Context) error {
 }
 
 func sdksUnInstall(ctx *cli.Context) error {
-	id := GetID(ctx)
+	id := GetID(ctx, "XDS_SDK_ID")
 	if id == "" {
 		return cli.NewExitError("id parameter or option must be set", 1)
 	}
@@ -346,7 +350,7 @@ func sdksUnInstall(ctx *cli.Context) error {
 }
 
 func sdksAbort(ctx *cli.Context) error {
-	id := GetID(ctx)
+	id := GetID(ctx, "XDS_SDK_ID")
 	if id == "" {
 		return cli.NewExitError("id parameter or option must be set", 1)
 	}