Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Envsetup: Cygwin doesn't have 'ps -o command'.
Browse files Browse the repository at this point in the history
Running build/envsetup.sh on cygwin always shows a
warning since there is no 'ps -o command' option.
Bash already sets SHELL=/bin/bash so we can rely on that if present.

Change-Id: I145b42508985735ba61d2b53b216ecc56e321943
  • Loading branch information
ralf-at-android committed Jun 20, 2011
1 parent 04b963a commit 70a86b0
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions envsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1077,13 +1077,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`
Expand Down

0 comments on commit 70a86b0

Please sign in to comment.