mirror of
https://github.com/f-droid/fdroidserver.git
synced 2026-05-18 13:39:55 -04:00
Also use adb via a full path
This commit is contained in:
@@ -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():
|
||||
|
||||
@@ -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"):
|
||||
|
||||
Reference in New Issue
Block a user