From 03dd0283bcc376095908a26b65f63bba1134b689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Ca=C3=B1as?= <fabiancanas@google.com>
Date: Fri, 5 Jan 2024 16:57:39 -0500
Subject: [PATCH] Fix numeric selection from lunch menu

Bug: 318871826
Test: 'lunch' with no arguments, then select a lunch target with a
number.

Change-Id: I8418ef0415437548d1429ec7a2c239d8c5b615d5
---
 envsetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/envsetup.sh b/envsetup.sh
index 212ed9fb9c..84a604c054 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -788,7 +788,7 @@ function lunch()
         selection=aosp_arm-trunk_staging-eng
     elif (echo -n $answer | grep -q -e "^[0-9][0-9]*$")
     then
-        local choices=($(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES))
+        local choices=($(TARGET_BUILD_APPS= TARGET_PRODUCT= TARGET_RELEASE= TARGET_BUILD_VARIANT= get_build_var COMMON_LUNCH_CHOICES 2>/dev/null))
         if [ $answer -le ${#choices[@]} ]
         then
             # array in zsh starts from 1 instead of 0.