Merge "Fix zsh compatibility issue in build/envsetup.sh"
am: 3da3191366
Change-Id: Ib7a59be4f53c21447835e13df166fea825b6dc99
This commit is contained in:
commit
49e3172779
|
@ -524,7 +524,7 @@ function choosevariant()
|
|||
export TARGET_BUILD_VARIANT=$default_value
|
||||
elif (echo -n $ANSWER | grep -q -e "^[0-9][0-9]*$") ; then
|
||||
if [ "$ANSWER" -le "${#VARIANT_CHOICES[@]}" ] ; then
|
||||
export TARGET_BUILD_VARIANT=${VARIANT_CHOICES[$(($ANSWER-1))]}
|
||||
export TARGET_BUILD_VARIANT=${VARIANT_CHOICES[@]:$(($ANSWER-1)):1}
|
||||
fi
|
||||
else
|
||||
if check_variant $ANSWER
|
||||
|
@ -1295,10 +1295,10 @@ function godir () {
|
|||
echo "Invalid choice"
|
||||
continue
|
||||
fi
|
||||
pathname=${lines[$(($choice-1))]}
|
||||
pathname=${lines[@]:$(($choice-1)):1}
|
||||
done
|
||||
else
|
||||
pathname=${lines[0]}
|
||||
pathname=${lines[@]:0:1}
|
||||
fi
|
||||
\cd $T/$pathname
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue