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