vm/adb: pass device|console info to script

jiangenj · jiangenj · commit 83e1e3814317 · 2025-04-07T13:25:25.000+08:00
diff --git a/vm/adb/adb.go b/vm/adb/adb.go
@@ -424,7 +424,7 @@ func (inst *instance) repair() error {
 
 func (inst *instance) runScript(script string) error {
 	log.Logf(2, "adb: executing %s", script)
-	output, err := osutil.RunCmd(5*time.Minute, "", "sh", script)
+	output, err := osutil.RunCmd(5*time.Minute, "", "sh", script, inst.device, inst.console)
 	if err != nil {
 		return fmt.Errorf("failed to execute %s: %w", script, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ func (inst *instance) repair() error {`
`424`	`424`
`425`	`425`	`func (inst *instance) runScript(script string) error {`
`426`	`426`	`log.Logf(2, "adb: executing %s", script)`
`427`		`- output, err := osutil.RunCmd(5*time.Minute, "", "sh", script)`
	`427`	`+ output, err := osutil.RunCmd(5*time.Minute, "", "sh", script, inst.device, inst.console)`
`428`	`428`	`if err != nil {`
`429`	`429`	`return fmt.Errorf("failed to execute %s: %w", script, err)`
`430`	`430`	`}`