Commit b5ad8942 authored by Carlos Knippschild's avatar Carlos Knippschild Committed by Commit Bot

Fix adb_remote_setup.sh version checking

With this change version checking will also ignore the line from the
version string that presents the local installation path for adb.

Change-Id: Ie7a3b26965b1d94d6d269f1b4b0919468d8eea2c
Reviewed-on: https://chromium-review.googlesource.com/978775Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Commit-Queue: Carlos Knippschild <carlosk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545618}
parent 6eb2a7ec
......@@ -63,8 +63,8 @@ fi
# Ensure local and remote versions of adb are the same.
remote_adb_version=$(ssh "$remote_host" "$remote_adb version" \
| grep -v "^Revision")
local_adb_version=$(adb version | grep -v "^Revision")
| grep -v -e "^Revision" -e "^Installed as")
local_adb_version=$(adb version | grep -v -e "^Revision" -e "^Installed as")
if [[ "$local_adb_version" != "$remote_adb_version" ]]; then
echo >&2
echo "WARNING: local adb is not the same version as remote adb." >&2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment