From 16c2e177998593e1064db923ca0b9fca76e31b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donncha=20=C3=93=20Cearbhaill?= Date: Mon, 18 Dec 2023 11:57:26 +0100 Subject: [PATCH] Kill existing adb server if running --- adb/adb.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/adb/adb.go b/adb/adb.go index 2759a36..2f214c6 100644 --- a/adb/adb.go +++ b/adb/adb.go @@ -30,6 +30,8 @@ func New() (*ADB, error) { } log.Debugf("ADB found at path: %s", adb.ExePath) + log.Debug("Killing existing ADB server if running") + adb.KillServer() return &adb, nil } @@ -129,3 +131,15 @@ func (a *ADB) ListFiles(remotePath string, recursive bool) ([]string, error) { return remoteFiles, nil } + +func (a *ADB) KillServer() (string, error) { + log.Debug("Killing adb server") + out, err := exec.Command(a.ExePath, "kill-server").Output() + if err != nil { + log.Debug("kill-server failed") + return "", err + } + + log.Debug("kill-server ok") + return strings.TrimSpace(string(out)), nil +}