}
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)
}
fmt.Fprintln(writer, "Version\t"+s.Version)
fmt.Fprintln(writer, "Status\t"+s.Status)
fmt.Fprintln(writer, "Path\t"+s.Path)
- fmt.Fprintln(writer, "Url\t"+s.URL)
+ fmt.Fprintln(writer, "Url\t"+formatURL(s.URL))
+ fmt.Fprintln(writer, "Image Url\t"+formatURL(s.ImageURL))
} else {
if first {
}
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")
}
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 {
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 {
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 {
}
})
- IOsk.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
+ IOSkClient.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
sdk, _ := ev.DecodeSDKEvent()
Log.Debugf("EVTSDKStateChange: %v", sdk)
})
// 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")
}
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)
}
}
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)
}
Log.Debugf("Result of %s: %v", url, newSdk)
return nil
}
+
+func formatURL(u string) string {
+ if u == "" {
+ return "-"
+ }
+ return u
+}