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