From 0bac4fe09dd1e708189dce2876c25fb8f590e1e7 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 7 Apr 2021 08:51:28 -0700 Subject: [PATCH] Make verifymodinfo in envsetup.sh quiet on errors during tab completion Test: m before having done a full build. Test: m after having done a full build. Change-Id: I35154151e6902d0337a26eab27d9d4fc797beed7 --- envsetup.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index e08fb0360..8a995c7fd 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1458,13 +1458,17 @@ function refreshmod() { # Verifies that module-info.txt exists, creating it if it doesn't. function verifymodinfo() { if [ ! "$ANDROID_PRODUCT_OUT" ]; then - echo "No ANDROID_PRODUCT_OUT. Try running 'lunch' first." >&2 + if [ "$QUIET_VERIFYMODINFO" != "true" ] ; then + echo "No ANDROID_PRODUCT_OUT. Try running 'lunch' first." >&2 + fi return 1 fi if [ ! -f "$ANDROID_PRODUCT_OUT/module-info.json" ]; then - echo "Could not find module-info.json. It will only be built once, and it can be updated with 'refreshmod'" >&2 - refreshmod || return 1 + if [ "$QUIET_VERIFYMODINFO" != "true" ] ; then + echo "Could not find module-info.json. It will only be built once, and it can be updated with 'refreshmod'" >&2 + fi + return 1 fi } @@ -1602,7 +1606,7 @@ function installmod() { function _complete_android_module_names() { local word=${COMP_WORDS[COMP_CWORD]} - COMPREPLY=( $(allmod | grep -E "^$word") ) + COMPREPLY=( $(QUIET_VERIFYMODINFO=true allmod | grep -E "^$word") ) } # Print colored exit condition