Include vendorsetup scripts in order

This fixes randomness of the combo index.

Change-Id: I533161fea8d1bc0c9dbd6ca2f3393d27310c9588
This commit is contained in:
Oleksiy Avramchenko 2014-10-06 18:51:58 +02:00 committed by Johan Redestig
parent 62003acdcc
commit 15760a8a96
1 changed files with 2 additions and 2 deletions

View File

@ -1487,8 +1487,8 @@ if [ "x$SHELL" != "x/bin/bash" ]; then
fi
# Execute the contents of any vendorsetup.sh files we can find.
for f in `test -d device && find -L device -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null` \
`test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null`
for f in `test -d device && find -L device -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort` \
`test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort`
do
echo "including $f"
. $f