Kill existing adb server if running

mvt-project · Dec 18, 2023 · 16c2e17 · 16c2e17
1 parent e96cdd4
commit 16c2e17
Showing 1 changed file with 14 additions and 0 deletions.
diff --git 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
+}