Also use adb via a full path

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 6376b530ddd529ac31fa348ec09afe3d0b5f8abb..f36b4768905a27c85951336793b19a19ffc087ef 100644 (file)
--- 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 50bf59c5b69a4cafc109af1042e35fc6d73f63d5..673efd6f1efd8b8b286e4988dddf47749cb359ea 100644 (file)
--- 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"):