am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."

* commit '7f5a314ab6dacb72eb37c87e064b21dbd44ccc7b':
  Envsetup: Cygwin doesn't have 'ps -o command'.
This commit is contained in:
Raphael Moll 2011-06-22 10:40:01 -07:00 committed by Android Git Automerger
commit d660540563
1 changed files with 9 additions and 7 deletions

View File

@ -1080,13 +1080,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`