From cd2524c9880615e008107f2c787adfad4a890851 Mon Sep 17 00:00:00 2001 From: lucarin91 Date: Mon, 17 Nov 2025 13:01:44 +0100 Subject: [PATCH 1/2] fix(pkg/board): handler error in GetCmd creation --- pkg/board/remote/adb/adb.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkg/board/remote/adb/adb.go b/pkg/board/remote/adb/adb.go index 6efdb1f4..6d34a0dc 100644 --- a/pkg/board/remote/adb/adb.go +++ b/pkg/board/remote/adb/adb.go @@ -227,6 +227,8 @@ func (a *ADBConnection) Remove(path string) error { type ADBCommand struct { cmd *paths.Process + + err error } func (a *ADBConnection) GetCmd(cmd string, args ...string) remote.Cmder { @@ -243,19 +245,31 @@ func (a *ADBConnection) GetCmd(cmd string, args ...string) remote.Cmder { cmds = append(cmds, args...) } - command, _ := paths.NewProcess(nil, cmds...) - return &ADBCommand{cmd: command} + command, err := paths.NewProcess(nil, cmds...) + return &ADBCommand{cmd: command, err: err} } func (a *ADBCommand) Run(ctx context.Context) error { + if a.err != nil { + return fmt.Errorf("failed to create command: %w", a.err) + } + return a.cmd.RunWithinContext(ctx) } func (a *ADBCommand) Output(ctx context.Context) ([]byte, error) { + if a.err != nil { + return nil, fmt.Errorf("failed to create command: %w", a.err) + } + return a.cmd.RunAndCaptureCombinedOutput(ctx) } func (a *ADBCommand) Interactive() (io.WriteCloser, io.Reader, io.Reader, remote.Closer, error) { + if a.err != nil { + return nil, nil, nil, nil, fmt.Errorf("failed to create command: %w", a.err) + } + stdin, err := a.cmd.StdinPipe() if err != nil { return nil, nil, nil, nil, fmt.Errorf("failed to get stdin pipe: %w", err) From 19e53d2338c5ac853ff7f60c2ae759af9ebaa064 Mon Sep 17 00:00:00 2001 From: lucarin91 Date: Mon, 17 Nov 2025 18:25:30 +0100 Subject: [PATCH 2/2] fixup! fix(pkg/board): handler error in GetCmd creation --- pkg/board/remote/adb/adb.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/board/remote/adb/adb.go b/pkg/board/remote/adb/adb.go index 6d34a0dc..8326976c 100644 --- a/pkg/board/remote/adb/adb.go +++ b/pkg/board/remote/adb/adb.go @@ -227,7 +227,6 @@ func (a *ADBConnection) Remove(path string) error { type ADBCommand struct { cmd *paths.Process - err error }