X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=gdb-xds.go;h=22a759cdd78a35846b12ecd4f695cad0906cd78e;hb=47e5cbce435cffe286c9128d36540f90a5bd7e20;hp=54f2270f189eac4836520e41b2d4e7c1a7a623c6;hpb=b14158a8c5c4fdd440bc19c5c72f25a15699d29a;p=src%2Fxds%2Fxds-gdb.git diff --git a/gdb-xds.go b/gdb-xds.go index 54f2270..22a759c 100644 --- a/gdb-xds.go +++ b/gdb-xds.go @@ -30,7 +30,7 @@ import ( "text/tabwriter" "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1" - common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git" "github.com/Sirupsen/logrus" sio_client "github.com/sebd71/go-socket.io-client" ) @@ -422,14 +422,18 @@ func (g *GdbXds) SendSignal(sig os.Signal) error { //***** Private functions ***** func (g *GdbXds) printProjectsList() (int, error) { + var prjExample *xaapiv1.ProjectConfig + var sdkExample *xaapiv1.SDK + writer := new(tabwriter.Writer) writer.Init(os.Stdout, 0, 8, 0, '\t', 0) msg := "" if len(g.projects) > 0 { fmt.Fprintln(writer, "List of existing projects (use: export XDS_PROJECT_ID=<< ID >>):") fmt.Fprintln(writer, "ID \t Label") - for _, f := range g.projects { + for ii, f := range g.projects { fmt.Fprintf(writer, " %s \t %s\n", f.ID, f.Label) + prjExample = &g.projects[ii] } } @@ -440,21 +444,22 @@ func (g *GdbXds) printProjectsList() (int, error) { } fmt.Fprintln(writer, "\nList of installed cross SDKs (use: export XDS_SDK_ID=<< ID >>):") fmt.Fprintln(writer, "ID \t Name") - for _, s := range sdks { + for ii, s := range sdks { if s.Status == xaapiv1.SdkStatusInstalled { fmt.Fprintf(writer, " %s \t %s\n", s.ID, s.Name) + sdkExample = &sdks[ii] } } - if len(g.projects) > 0 && len(sdks) > 0 { + if prjExample != nil && sdkExample != nil { fmt.Fprintln(writer, "") fmt.Fprintln(writer, "For example: ") if runtime.GOOS == "windows" { fmt.Fprintf(writer, " SET XDS_PROJECT_ID=%s && SET XDS_SDK_ID=%s && %s -x myGdbConf.ini\n", - g.projects[0].ID[:8], sdks[0].ID[:8], AppName) + prjExample.ID[:8], sdkExample.ID[:8], AppName) } else { fmt.Fprintf(writer, " XDS_PROJECT_ID=%s XDS_SDK_ID=%s %s -x myGdbConf.ini\n", - g.projects[0].ID[:8], sdks[0].ID[:8], AppName) + prjExample.ID[:8], sdkExample.ID[:8], AppName) } } fmt.Fprintln(writer, "")