commit b4c030781e1980ee061bd8613eef247559071cfd
author Jim Tang <jimtang@google.com> Wed Oct 03 22:46:22 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 03 22:46:22 2018 -0700
tree fc22e12d1def39ac0e019f98b69fa28bac750ddd
parent e85994c1eed8acdf327e614a817ed258ad2b39fe
parent c0d20c3e93193d895829f890f405d57455b803bc

Merge "Envsetup: Fix lunch choice with number in zsh" am: 2647067ae9 am: 845a588927
am: c0d20c3e93

Change-Id: I66ca3e2c54454d86e455e62643ddc8ce4876e3e7

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 5894144..5cbd9eb 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -585,7 +585,13 @@
         local choices=($(TARGET_BUILD_APPS= LUNCH_MENU_CHOICES="${LUNCH_MENU_CHOICES[@]}" get_build_var COMMON_LUNCH_CHOICES))
         if [ $answer -le ${#choices[@]} ]
         then
-            selection=${choices[$(($answer-1))]}
+            # array in zsh starts from 1 instead of 0.
+            if [ -n "$ZSH_VERSION" ]
+            then
+                selection=${choices[$(($answer))]}
+            else
+                selection=${choices[$(($answer-1))]}
+            fi
         fi
     else
         selection=$answer