commit 2647067ae9f3d616e47a1d2374784417e97d13ae
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 04 05:23:16 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 04 05:23:16 2018 +0000
tree 34e2cda1a6e43895ff29c2f1ae1c394d49d182ed
parent 08fff56237747b8e3c09523389075026c293e90b
parent 0e3397b2252b52edca3743469db6bd5db8154cfd

Merge "Envsetup: Fix lunch choice with number in zsh"

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