Also use adb via a full path

[fdroidserver.git] / fdroidserver / install.py

diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index a95ee6fd8aaadc775a840eadb485d601c1c302f2..673efd6f1efd8b8b286e4988dddf47749cb359ea 100644 (file)
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -30,11 +30,12 @@ from common import FDroidPopen
 options = None
 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.stdout)
-    lines = p.stdout.splitlines()
+        raise Exception("An error occured when finding devices: %s" % p.output)
+    lines = p.output.splitlines()
     if lines[0].startswith('* daemon not running'):
         lines = lines[2:]
     if len(lines) < 3:
@@ -51,6 +52,8 @@ def main():
     parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     parser.add_option("-a", "--all", action="store_true", default=False,
                       help="Install all signed applications available")
     (options, args) = parser.parse_args()
@@ -97,9 +100,9 @@ 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])
-            fail= ""
-            for line in p.stdout.splitlines():
+            p = FDroidPopen([config['adb'], "-s", dev, "install", apk])
+            fail = ""
+            for line in p.output.splitlines():
                 if line.startswith("Failure"):
                     fail = line[9:-1]
             if not fail:
@@ -115,4 +118,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-