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

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

Issue 926003002: Allow either the old or new version of ADB on mac. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix logic Created 5 years, 10 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 e372dd2913021d0081c812b857a002f5e75bfb98..cb3311aa641fbf7c1c62cf8b7d8f6fd5ea421111 100644
--- a/platform_tools/android/bin/utils/setup_adb.sh
+++ b/platform_tools/android/bin/utils/setup_adb.sh
@@ -21,14 +21,14 @@ fi
if [ $(uname) == "Linux" ]; then
ADB_REQUIRED="1.0.32"
elif [ $(uname) == "Darwin" ]; then
- ADB_REQUIRED="1.0.31"
+ ADB_REQUIRED="1.0.31 or 1.0.32"
fi
# get the version and then truncate it to be just the version numbers
ADB_VERSION="$($ADB version)"
ADB_VERSION="${ADB_VERSION##* }"
-if [ $ADB_VERSION != $ADB_REQUIRED ]; then
+if [[ "$ADB_REQUIRED" != *"$ADB_VERSION"* ]]; then
echo "WARNING: Your ADB version is out of date!"
echo " Expected ADB Version: ${ADB_REQUIRED}"
echo " Actual ADB Version: ${ADB_VERSION}"
« 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