Merge "Include vendorsetup scripts in order"
This commit is contained in:
commit
b4b996a8ee
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue