Skip to content

Commit

Permalink
Fix adb_remote_setup.sh version checking
Browse files Browse the repository at this point in the history
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/978775
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Carlos Knippschild <carlosk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545618}
  • Loading branch information
chuim authored and Commit Bot committed Mar 23, 2018
1 parent 6eb2a7e commit b5ad894
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/android/adb_remote_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b5ad894

Please sign in to comment.