From c420d2c3f4f2166ebc8c7428c61250914b827aec Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 27 Jul 2015 10:05:16 -0700 Subject: [PATCH] Fix sky_tool's installing of SkyShell.apk We were walking over to the realdir too quickly, which meant we lost which version of the sky_engine package we were supposed to use. --- packages/flutter/lib/sky_tool | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/flutter/lib/sky_tool b/packages/flutter/lib/sky_tool index 3d82fcf5f7f..ec4b787c864 100755 --- a/packages/flutter/lib/sky_tool +++ b/packages/flutter/lib/sky_tool @@ -16,10 +16,9 @@ import urlparse import time # TODO(eseidel): This should be BIN_DIR. -LIB_DIR = os.path.realpath(os.path.dirname(os.path.abspath(__file__))) -SKY_PACKAGE_ROOT = os.path.realpath(os.path.dirname(LIB_DIR)) -SKY_ENGINE_PACKAGE_ROOT = os.path.realpath(os.path.join(SKY_PACKAGE_ROOT, - os.pardir, 'sky_engine')) +PACKAGE_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +SKY_ENGINE_PACKAGE = os.path.join(PACKAGE_ROOT, 'sky_engine') +APK_DIR = os.path.join(os.path.realpath(SKY_ENGINE_PACKAGE), os.pardir, 'apks') SKY_SERVER_PORT = 9888 OBSERVATORY_PORT = 8181 @@ -166,7 +165,7 @@ class StartSky(object): args.install = True if args.install: - apk_path = os.path.join(SKY_ENGINE_PACKAGE_ROOT, 'apks', APK_NAME) + apk_path = os.path.join(APK_DIR, APK_NAME) if not os.path.exists(apk_path): print "'%s' does not exist?" % apk_path return 2