X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmd-exec.go;h=c988f95f6e1b03628850c99c977ab3d8444caa6d;hb=00b5b83dcff4904aeb18760caa193fa3393241e0;hp=83743a3f5374035d8b4e3a46fc1947b386c69ce5;hpb=7d1bcb1c9a48514e0e26246b86c8597502833b4b;p=src%2Fxds%2Fxds-cli.git diff --git a/cmd-exec.go b/cmd-exec.go index 83743a3..c988f95 100644 --- a/cmd-exec.go +++ b/cmd-exec.go @@ -31,7 +31,7 @@ func initCmdExec(cmdDef *[]cli.Command) { *cmdDef = append(*cmdDef, cli.Command{ Name: "exec", Usage: "execute a command in XDS", - Action: exec, + Action: execCmd, Flags: []cli.Flag{ cli.StringFlag{ Name: "id", @@ -52,7 +52,7 @@ func initCmdExec(cmdDef *[]cli.Command) { }) } -func exec(ctx *cli.Context) error { +func execCmd(ctx *cli.Context) error { prjID := ctx.String("id") rPath := ctx.String("rpath") sdkid := ctx.String("sdkid") @@ -78,7 +78,7 @@ func exec(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) exitChan <- exitResult{err, 2} }) @@ -96,15 +96,15 @@ func exec(ctx *cli.Context) error { } } - IOsk.On(xaapiv1.ExecOutEvent, func(ev xaapiv1.ExecOutMsg) { + IOSkClient.On(xaapiv1.ExecOutEvent, func(ev xaapiv1.ExecOutMsg) { outFunc(ev.Timestamp, ev.Stdout, ev.Stderr) }) - IOsk.On(xaapiv1.ExecExitEvent, func(ev xaapiv1.ExecExitMsg) { + IOSkClient.On(xaapiv1.ExecExitEvent, func(ev xaapiv1.ExecExitMsg) { exitChan <- exitResult{ev.Error, ev.Code} }) - IOsk.On(xaapiv1.EVTProjectChange, func(ev xaapiv1.EventMsg) { + IOSkClient.On(xaapiv1.EVTProjectChange, func(ev xaapiv1.EventMsg) { prj, _ := ev.DecodeProjectConfig() Log.Infof("Event %v (%v): %v", ev.Type, ev.Time, prj) })