From c29eece05ffb32cfb73e71dcc322398441c31495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 17 Jul 2015 23:09:29 -0700
Subject: [PATCH] Don't start adb on search unless strictly necessary

---
 cmd/fdroidcl/devices.go | 12 ++----------
 cmd/fdroidcl/search.go  |  2 --
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/cmd/fdroidcl/devices.go b/cmd/fdroidcl/devices.go
index d599576..820f12a 100644
--- a/cmd/fdroidcl/devices.go
+++ b/cmd/fdroidcl/devices.go
@@ -40,22 +40,14 @@ func startAdbIfNeeded() {
 	}
 }
 
-func maybeOneDevice() *adb.Device {
+func mustOneDevice() *adb.Device {
 	startAdbIfNeeded()
 	devices, err := adb.Devices()
 	if err != nil {
 		log.Fatalf("Could not get devices: %v", err)
 	}
 	if len(devices) != 1 {
-		return nil
-	}
-	return devices[0]
-}
-
-func mustOneDevice() *adb.Device {
-	device := maybeOneDevice()
-	if device == nil {
 		log.Fatalf("Exactly one connected device is needed")
 	}
-	return device
+	return devices[0]
 }
diff --git a/cmd/fdroidcl/search.go b/cmd/fdroidcl/search.go
index aa87e3b..720c510 100644
--- a/cmd/fdroidcl/search.go
+++ b/cmd/fdroidcl/search.go
@@ -36,8 +36,6 @@ func runSearch(args []string) {
 	var device *adb.Device
 	if *installed || *updates {
 		device = mustOneDevice()
-	} else {
-		device = maybeOneDevice()
 	}
 	index := mustLoadIndex()
 	apps := filterAppsSearch(index.Apps, args)