am d6605405: am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit 'd66054056311a369a090cd1aae2557454fdc7ecc': Envsetup: Cygwin doesn't have 'ps -o command'.
This commit is contained in:
commit
de50d0ab20
16
envsetup.sh
16
envsetup.sh
|
@ -1106,13 +1106,15 @@ function set_java_home() {
|
|||
fi
|
||||
}
|
||||
|
||||
case `ps -o command -p $$` in
|
||||
*bash*)
|
||||
;;
|
||||
*)
|
||||
echo "WARNING: Only bash is supported, use of other shell would lead to erroneous results"
|
||||
;;
|
||||
esac
|
||||
if [ "x$SHELL" != "x/bin/bash" ]; then
|
||||
case `ps -o command -p $$` in
|
||||
*bash*)
|
||||
;;
|
||||
*)
|
||||
echo "WARNING: Only bash is supported, use of other shell would lead to erroneous results"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Execute the contents of any vendorsetup.sh files we can find.
|
||||
for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/*/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`
|
||||
|
|
Loading…
Reference in New Issue