Commit 0e3397b2 authored Oct 03, 2018 by Jim Tang

Envsetup: Fix lunch choice with number in zsh

(zsh)$ source build/envsetup.sh; lunch 23
will result in selecting #22 because array in zsh starts from 1
instead of 0. This CL is to fix this issue.

Bug: b/117202855
Test: below commands should have the same output:
    (zsh)$ source build/envsetup.sh; lunch 23
    (zsh)$ source build/envsetup.sh; lunch aosp_walleye-userdebug

Change-Id: I0570585417878bc7c73eda0e1a416232fe147fb4

parent 9c68021f

envsetup.sh

+7 −1

Original line number	Diff line number	Diff line
		@@ -585,8 +585,14 @@ function lunch()
		local choices=($(TARGET_BUILD_APPS= LUNCH_MENU_CHOICES="${LUNCH_MENU_CHOICES[@]}" get_build_var COMMON_LUNCH_CHOICES))
		if [ $answer -le ${#choices[@]} ]
		then
		# 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
		fi