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

am: c0d20c3e93

Change-Id: I66ca3e2c54454d86e455e62643ddc8ce4876e3e7
This commit is contained in:
Jim Tang 2018-10-03 22:46:22 -07:00 committed by android-build-merger
commit b4c030781e
1 changed files with 7 additions and 1 deletions

View File

@ -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