From 8ec1e649bf842b9e102e6705d4228bf1ca09f471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 19 Jun 2015 13:15:19 +0200
Subject: [PATCH] Adb start server fixes

---
 adb/adb.go              | 7 +------
 cmd/fdroidcl/devices.go | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/adb/adb.go b/adb/adb.go
index 726d546..3e4f5fc 100644
--- a/adb/adb.go
+++ b/adb/adb.go
@@ -79,12 +79,7 @@ func IsServerRunning() bool {
 }
 
 func StartServer() error {
-	cmd := exec.Command("adb", "start-server")
-	err := cmd.Run()
-	if err != nil {
-		return err
-	}
-	return cmd.Wait()
+	return exec.Command("adb", "start-server").Run()
 }
 
 type Device struct {
diff --git a/cmd/fdroidcl/devices.go b/cmd/fdroidcl/devices.go
index 2e7f40a..7fd2412 100644
--- a/cmd/fdroidcl/devices.go
+++ b/cmd/fdroidcl/devices.go
@@ -41,6 +41,7 @@ func startAdbIfNeeded() {
 }
 
 func maybeOneDevice() *adb.Device {
+	startAdbIfNeeded()
 	devices, err := adb.Devices()
 	if err != nil {
 		log.Fatalf("Could not get devices: %v", err)