Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: platform_tools/android/bin/utils/setup_adb.sh

Issue 1583793002: Make android scripts not warn about ADB in newer SDKs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/bin/utils/setup_adb.sh
diff --git a/platform_tools/android/bin/utils/setup_adb.sh b/platform_tools/android/bin/utils/setup_adb.sh
index cb3311aa641fbf7c1c62cf8b7d8f6fd5ea421111..767027b8cfb3e580686c0ee5a45e03c6237c0ffd 100644
--- a/platform_tools/android/bin/utils/setup_adb.sh
+++ b/platform_tools/android/bin/utils/setup_adb.sh
@@ -1,5 +1,7 @@
-#!/bin/bash
+# Copyright 2015 Google Inc.
#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
UTIL_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -24,9 +26,10 @@ elif [ $(uname) == "Darwin" ]; then
ADB_REQUIRED="1.0.31 or 1.0.32"
fi
-# get the version and then truncate it to be just the version numbers
+# get the version string as an array, use just the version numbers
ADB_VERSION="$($ADB version)"
-ADB_VERSION="${ADB_VERSION##* }"
+ADB_VERSION=($ADB_VERSION)
+ADB_VERSION=${ADB_VERSION[4]}
djsollen 2016/01/13 14:32:04 I think this will break backwards compatibility fo
Kimmo Kinnunen 2016/01/13 15:19:50 The intention is exactly getting the 5th element.
if [[ "$ADB_REQUIRED" != *"$ADB_VERSION"* ]]; then
echo "WARNING: Your ADB version is out of date!"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698