From 814d87fc87b2d1733c16498e01cb80c8ddccedeb Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 7 Apr 2015 15:15:56 -0700 Subject: [PATCH] Fix sky_tool's calling of adb, and shelldb's analyze and stop Just silly fixes needed for our 4 copies of our python run script. R=ianh@google.com Review URL: https://codereview.chromium.org/1064983003 --- packages/flutter/lib/sky_tool | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/flutter/lib/sky_tool b/packages/flutter/lib/sky_tool index 7d0747083bd..f7b8b6f1164 100755 --- a/packages/flutter/lib/sky_tool +++ b/packages/flutter/lib/sky_tool @@ -209,8 +209,19 @@ class StopSky(object): class SkyShellRunner(object): + def _check_for_adb(self): + try: + subprocess.call([ADB_PATH, '--help']) + except OSError: + print "'adb' (from the Android SDK) not in $PATH, can't continue." + return False + return True + + def main(self): logging.basicConfig(level=logging.WARNING) + if not self._check_for_adb() + sys.exit(2) parser = argparse.ArgumentParser(description='Sky Demo Runner') subparsers = parser.add_subparsers(help='sub-command help')