X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmd-sdks.go;h=00052156b498ac157aec5272a1bda2f2fcb1ed5d;hb=0012c3c7b256df7db834080740d8fc124c9dba22;hp=eeebffaa8fa19d5e0b40d8381b3fc3e5b88db139;hpb=00b5b83dcff4904aeb18760caa193fa3393241e0;p=src%2Fxds%2Fxds-cli.git diff --git a/cmd-sdks.go b/cmd-sdks.go index eeebffa..0005215 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) } @@ -187,7 +187,8 @@ func _displaySdks(sdks []xaapiv1.SDK, verbose bool, all bool, filter string) { 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 { @@ -226,7 +227,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") @@ -305,6 +306,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 +327,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 +351,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) } @@ -361,3 +366,10 @@ func sdksAbort(ctx *cli.Context) error { Log.Debugf("Result of %s: %v", url, newSdk) return nil } + +func formatURL(u string) string { + if u == "" { + return "-" + } + return u +}