diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-22 16:57:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-22 16:57:19 +0000 |
| commit | aa26ce4d75ca724cc949821823fd9ee02101b0c3 (patch) | |
| tree | 558374322d19d667c56931b9248239bcf167433a | |
| parent | 12d3417708e3d35d4acbb9cc2457a3dd6266ee3a (diff) | |
| parent | 57c47b70559e343102362caa6db496d59368469d (diff) | |
| download | build-aa26ce4d75ca724cc949821823fd9ee02101b0c3.tar.gz | |
Merge "envsetup.sh: work around zsh's built-in `which`." into main
| -rw-r--r-- | envsetup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/envsetup.sh b/envsetup.sh index 74cfbbd7f3..fbe522d866 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1093,7 +1093,9 @@ function cproj() # that my Mac has /usr/local/bin/adb installed by default and on the default # path. function adb() { - local ADB=$(which adb) + # We need `command which` because zsh has a built-in `which` that's more + # like `type`. + local ADB=$(command which adb) if [ -z "$ADB" ]; then echo "Command adb not found; try lunch (and building) first?" return 1 |