Merge "Envsetup: Cygwin doesn't have 'ps -o command'."

This commit is contained in:
Raphael Moll
2011-06-22 10:17:02 -07:00
committed by Android Code Review

View File

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