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

2018-10-04 05:23:16 +00:00 · 2018-10-04 05:23:16 +00:00 · 2647067ae9
parent 08fff56237 0e3397b225
commit 2647067ae9
1 changed files with 7 additions and 1 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@ -585,7 +585,13 @@ function lunch()
        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