From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 3 Jul 2014 16:21:33 +0000 (+0200)
Subject: Also use adb via a full path
X-Git-Tag: 0.2.1~51
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a8d4c8705f1a8b40d5c83cd883e111dc432d1c7c;p=fdroidserver.git

Also use adb via a full path
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 6376b530..f36b4768 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -136,6 +136,9 @@ def read_config(opts, config_file='config.py'):
         'android': [
             os.path.join(config['sdk_path'], 'tools', 'android'),
             ],
+        'adb': [
+            os.path.join(config['sdk_path'], 'platform-tools', 'adb'),
+            ],
         }
 
     for b, paths in bin_paths.items():
diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index 50bf59c5..673efd6f 100644
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -32,7 +32,7 @@ config = None
 
 
 def devices():
-    p = FDroidPopen(["adb", "devices"])
+    p = FDroidPopen([config['adb'], "devices"])
     if p.returncode != 0:
         raise Exception("An error occured when finding devices: %s" % p.output)
     lines = p.output.splitlines()
@@ -100,7 +100,7 @@ def main():
         logging.info("Installing %s..." % apk)
         for dev in devs:
             logging.info("Installing %s on %s..." % (apk, dev))
-            p = FDroidPopen(["adb", "-s", dev, "install", apk])
+            p = FDroidPopen([config['adb'], "-s", dev, "install", apk])
             fail = ""
             for line in p.output.splitlines():
                 if line.startswith("Failure"):