Make id option overwrite XDS_xxx_ID env var

[src/xds/xds-cli.git] / cmd-sdks.go

diff --git a/cmd-sdks.go b/cmd-sdks.go
index eeebffa..35b053e 100644 (file)
--- 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")
@@ -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)
        }